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-25 06:42:11

Daniel James <daniel <at> calamity.org.uk> writes:

> 
> On 24 December 2013 16:56, Peter A. Bigot <pab <at> pabigot.com> wrote:
> > On 12/24/2013 10:46 AM, Daniel James wrote:
> >>
> >> git diff --binary origin/develop | git apply -R --index
> >> git commit -m "Copy content from develop"
> >>
> >> Which is at least less fuss than the other solutions.
> >
> > It does make the content identical, but the resulting commit has a
> > different SHA1 than origin/master, so leaves open the potential for
> > future conflicts.
> 
> No it doesn't. Merge compares the merge base (current develop), and
> the two heads. it doesn't care what comes between.
> 
> >  Doing a "-s ours" merge in develop brings both
> > content and git parentage into sync.
> 
> I had thought of doing it that way, but I was trying to find a simpler
> method. There's already enough confusion.

So, I did as Daniel instructed and seemingly eveything's OK now
in master branch. So, should I do

  git checkout develop
  git merge -s ours

to sync up SHAs between master and develop, or should I leave like that?

Thank you,

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