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

Subject: Re: [boost] [git][multi_index] help merging from develop
From: Joaquin M Lopez Munoz (joaquin_at_[hidden])
Date: 2013-12-24 11:50:05

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

> ... check you got what you want
> git tag -d bad-merge  # for the paranoid that now has calmed down
> 

Joaquín M López Muñoz
Telefónica Digital