Subject: Re: [boost] [git][multi_index] help merging from develop
From: Joaquin M Lopez Munoz (joaquin_at_[hidden])
Date: 2013-12-24 09:25:27
John Maddock <john <at> johnmaddock.co.uk> writes:
> I'm not sure what's happened here, if I look at:
> https://github.com/boostorg/multi_index/commits/master I see lots of commits
> post the last SVN merge on Aug 28th - which is what I would expect - "git
> merge" works by replaying the commits from one branch on another, and that
> appears to be what's happened.
> But if I pull the latest sources, then like you, I see lots of unmerged
> changes if I do a "git diff master origin/develop".
> Is it possible there were unmerged changes from prior to this one:
> 590e3d151181716f05a4daaf7f371cbde04171d7 ?
I don't think this is the case. The unmeged changes are certainly more
recent than 4 months.
I think somehow I merged with -s ours (as Daniel suspects) and now Git
nonchalantly refuses to see that the branches are indeed different.
JoaquÃn M LÃ³pez MuÃ±oz
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk