Subject: Re: [boost] [git][multi_index] help merging from develop
From: Peter A. Bigot (pab_at_[hidden])
Date: 2013-12-24 11:46:37
On 12/24/2013 10:24 AM, Bjørn Roald wrote:
> 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.
>
> 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
> ... check you got what you want
> git tag -d bad-merge # for the paranoid that now has calmed down
I don't believe that will work; 3239677 (current master) already has
develop recorded as being present, so you get:
llc[431]$ git merge --no-ff develop
Already up-to-date.
without any change. Since git-merge does not have a "-s theirs"
parameter, the following does work:
git checkout -b hack develop
git merge master -s ours \
-m 'Merge to sync develop and master preferring develop'
git checkout master
git merge hack
git branch -d hack
git checkout develop
git merge master
That last two merges are fast-forward, which is fine in this case.
Check the results before you push (in fact, check the results after each
step so you understand what it's doing).
Peter