[webkit-qt] git confusion - pull to update is merging entire tree

Lindsay Mathieson lindsay.mathieson at gmail.com
Sun Apr 24 05:31:09 PDT 2011

I have a git clone of master (git at gitorious.org: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.

What's going on? I certainly did not change every file


More information about the webkit-qt mailing list