l...@gnu.org (Ludovic Courtès) writes:
> Mark H Weaver <m...@netris.org> skribis:
>
>> I went ahead and pushed a proper merge of stable-2.0 into master.
>
> Great, thanks! Which method did you use?
I used the more elaborate method described in my earlier email, so the
git history looks like the merges that wingo has been doing. In other
words, I pushed only one new commit to the master branch, namely the one
produced by "git merge origin/stable-2.0". However, to resolve the
merge conflicts I simply copied the files from the end result of my
earlier one-commit-at-a-time approach.
I saved a copy of the stable-2.0 patches adapted to master (as output by
"git format-patch") which produce precisely the same result as my merge
commit. If you like, I can make them available.
Mark
