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 http://article.gmane.org/gmane.comp.kde.cvs/1008397 to be pushed. Regards, Ben >> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
