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-25 07:26:12

On 12/25/2013 12:49 PM, Joaquin M Lopez Munoz wrote:
> Bjørn Roald <bjorn <at> 4roald.org> writes:
>
>>
>> Right now it seems like the boost super
>>> project develop branch points at the
>>> fdd4934c234de61f8d2ba22fc3465a0ac90e11c5 commit of the multi_index
>>> submodule, which is the head of multi_index's develop branch, thus there
>>> are little risk involved in moving the master branch head if you like to
>>> do that.
>>
>> is seems that was not correct, the super module points at your latest
>> unsuccessful merge commit in master.
>> [...]
>
> Hi Bjørn, thanks for your guidance. At some point down the thread
> the details of your preocedure begin to elude my understanding :-)
> so I decided to go ahead with the diff-based suggestion by Daniel, which
> conceptually is as simple as it gets.

OK, do what work best for you.

> I sincerely hope that this is just a case of a particularly inept
> author (me) messing things up, but the aftertaste has left me worried.
> Maybe the supporting pages need to be more idiot-proof than they
> are now.

In fact the first merge into master from develop after the SVN to Git 
conversion is important to get right. If not things become confusing as 
Git has no sensible common ancestor for the two branches, and what merge 
does may surprise you.

--
Bjørn