On Sun, Apr 24, 2011 at 9:31 AM, Lindsay Mathieson <[email protected]> wrote: > I have a git clone of master ([email protected]:webkit/webkit.git) > from a couple of weeks back. I've made some minor changes to several > files in QtWebKit and QtTestBrowser, commited them and just tried to > do a "git pull" to update from master. > > It downloaded over 600MB, tried to merge what looked like the entire > source tree which failed with a conflict problem - not sure where. >
Are you sure you just cloned? Did you add any remotes or other repositories? There are a few webkit git repositories around but not all of them are compatible. Your problem sounds like merging two different/incompatible git trees. For example, [email protected]:webkit/webkit.git is different than git://git.webkit.org/WebKit.git If in doubt, check your .git/config file from inside the project dir. Cheers, - Ademar -- Ademar de Souza Reis Jr. <[email protected]> OpenBossa - Instituto Nokia de Tecnologia _______________________________________________ webkit-qt mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-qt
