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

Subject: Re: [boost] [git][multi_index] help merging from develop
From: Daniel James (daniel_at_[hidden])
Date: 2013-12-24 13:58:02

On 24 December 2013 16:56, Peter A. Bigot <pab_at_[hidden]> wrote:
> On 12/24/2013 10:46 AM, Daniel James wrote:
>>> Yes, I want the master branch to be exactly the same aas the branch
>>> develop stands now.
>>
>> There used to be 'git merge -s theirs' for doing that, which was the
>> opposite of 'git merge -s ours' but they removed it. I did a quick
>> search and found a solution on stack overflow
>> (http://stackoverflow.com/a/5211321/2434):
>>
>> 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.