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

[Konstantin Tokarev]

24.04.2011, 16:31, "Lindsay Mathieson" <lindsay.mathieson at gmail.com>:
> 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 is not a good workflow - you should commit your changes to your topic branch
and then rebase it on master (or other upstream branch) if/when needed.

-- 
Regards,
Konstantin