On 05/24/2013 09:07 AM, Vincent van Ravesteijn wrote:
By the way, this doesn't always work. The kill-gettext branch, for
instance, has master merged in a few times to fix merge conflicts.
Now, rebasing onto the merge-base does do no good.
Yes, in that case, it would seem merging into master makes the most sense.
# Now rebase against master
git rebase master
You could just as well had rebased to master in the previous step
(avoiding the problem I stated above).
It's somewhat easier, for me, at least, to handle these two steps
separately: (i) Deal with cleaning up the history locally; (ii) Rebase
(or merge), and fix the conflicts. Mixing the two tasks gets confusing.
Richard
