Usage of pull rebasing and merges

Ben Cooksley bcooksley at
Tue Feb 8 08:20:55 GMT 2011

Hi all,

Just a word of warning, if you are going to merge two branches
together, make sure to run "git pull --rebase" before you conduct the
merge. Once you have conducted the merge, use "git pull" if you
encounter a non-fast forward error. Do not run "git pull --rebase"
after performing the merge, under any circumstances.

If you do a "git pull --rebase" after performing a merge, then the
merge, as well as all the commits it pulled in will be rebased, along
with the attached consequences of that. This is what caused commits
such as to be

>> Visit to unsubscribe <<

More information about the kde-core-devel mailing list