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 07:21:15

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

> 
> On 25 December 2013 12:06, Joaquin M Lopez Munoz <joaquin <at> tid.es> 
> >
> > This I did, and the merge was indeed a fast-forward one, but Git refuses
> > to do then a commit on grounds that there are no changes:
> 
> You don't need to do a commit after a fast-forward merge, as it just
> moves you to the latest version from the other branch. But I forgot
> that we're avoiding fast-forward merges, so it's probably best not to
> merge from master at all. You can remove all your local changes using:
> 
> git checkout develop
> git reset origin/develop
> 
> That resets the develop branch back to its state on the server. If
> you're only making changes on develop, merges to master shouldn't
> conflict. You'll also have a clean history in develop, which will be
> useful for looking at the history of files.

OK, I did as you tell, commands executed without any further indication,
so I'm officialy declaring this problem solved :-) Thanks everybody for the
prompt help. I certainly need to read more about Git during my vacation.

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