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

Ariya Hidayat ariya.hidayat at gmail.com
Sun Apr 24 10:33:41 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

"a couple of weeks" is considered prehistoric old, in WebKit timeline.
Especially recently since there was few refactorings which touched
almost every tests baselines.

I highly recommend a different workflow: very often merge/rebase.

Ariya Hidayat

More information about the webkit-qt mailing list