Boost logo

Boost :

From: Mateusz Loskot (mateusz_at_[hidden])
Date: 2019-10-29 17:16:56


As we discovered, the merge that is going to happen today
will not be free from conflicts. That is due to source tree changes
applied in a bunch of cherry-picked commits from develop and
merged to master as part of this emergency PR [1] fixing our docs.

Below, I suggest semi-manual conflict resolution (or least troublesome one)
for the current develop to master merge:

1. First, let git merge preferring changes in develop

git merge -s recursive -X theirs develop

2. Merge status will still report some unmerged paths

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
        deleted by them: .ci/
        both deleted: io/test_images/jpg/EddDawson/36dpi.jpg
        both deleted: io/test_images/jpg/test.jpg
        added by them: test/extension/io/images/jpeg/EddDawson/36dpi.jpg
        added by them: test/extension/io/images/jpeg/test.jpg
        added by us: test/extension/io/images/jpg/EddDawson/36dpi.jpg
        added by us: test/extension/io/images/jpg/test.jpg
        added by us:
        added by us: test/extension/io/images/pnm/readme.txt
        added by us: test/extension/toolbox/CMakeLists.txt

3. Resolve the unmerged paths manually

git add .ci
git rm -r io/test_images/jpg
git rm -r test/extension/io/images/jpg
git add test/extension/io/images/jpeg/
git add test/extension/io/images/png/grayalpha-with-tRNS-chunk.png
git add test/extension/io/images/pnm/readme.txt
git add test/extension/toolbox/CMakeLists.txt

4. Finally, complete the merge

git merge --editor --continue

I suggest to update the merge commit message and mention
the Boost release version, like this:

   "Merge branch 'develop' for Boost 1.72 release"


Best regards,

Mateusz Loskot,

Boost list run by Boost-Gil-Owners