Re: [boost] [git] Post svn conversion merge point instructions moved

Beman Dawes wrote:

I'm unsure how Peter's prep steps interact with the actual merge point instructions. Particularly, what SHA is used for the merge point?

None. After master and develop are brought in sync using cherry-pick and/or revert as necessary, one just does git merge --no-ff develop from master, and git merge --no-ff master from develop. One of these two merges may be redundant. I did both, just to be on the safe side. The important thing is that there is no "-s ours" option, which is (if my understanding is correct) generally the source of any subsequent problems.