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-25 06:57:59

On 25 December 2013 11:42, Joaquin M Lopez Munoz <joaquin_at_[hidden]> wrote:
>
> 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?

You can, but you don't need "-s ours":

git checkout develop
git merge master

It should be a fast-forward merge.