Re: [boost] [git][multi_index] help merging from develop

Subject: Re: [boost] [git][multi_index] help merging from develop
From: Bjørn Roald (bjorn_at_[hidden])
Date: 2013-12-24 12:17:20

On 12/24/2013 05:50 PM, Joaquin M Lopez Munoz wrote:
> Bjørn Roald <bjorn <at> 4roald.org> writes:
>
>>
>> On 12/24/2013 03:19 PM, Joaquin M Lopez Munoz wrote:
>>>
>>> Yes, I want the master branch to be exactly the same aas the branch
>>> develop stands now.
>>
>> Then just try it again.
>
> No luck, see below,
>
>> git checkout master
>> git tag bad-merge  # for the paranoid needing an easy way to get back!
>> git reset --hard 3239677c40b6e15d1bb49675cabb077460333538
>> git merge --no-ff develop
>
> I got "Alredy up-to-date." here

right, see my reply to Peter on this, copy-paste error of mine.  Should 
have been.

git reset --hard 3239677c40b6e15d1bb49675cabb077460333538

I tried it out now by the way, if you do it the way I suggested you will 
need to deal with 4 merge conflicts as well.  Probably caused by the 
intermittent hotfix in SVN history.  You may prefer the approach Peter 
suggested instead as it leaves your bad merge commit in the history of 
the master branch if you so prefer.

Note removing commits in master branch may be bad if the boost super 
project references it, to keep it in the history of the master branch is 
one way of avoiding that.

--
Bjørn