Re: merge disagrees with diff

On Fri, 28 Oct 2011 12:49:35 +0000, Flemming Frandsen wrote:
...
> This is not the only time I've seen the problem manifest, but the
> circumstances where similar, in the other case another developer was
> trying to merge a change from version-1 to version-2, he too got extra
> changes in his merge target.

You didn't get a clean merge; you got a conflict. When you get a conflict,
it is your job to look at what you merged and at the proposed result,
and resolve it yourself.

Here it may simply be that you get the conflict because you want to merge
in the addition of a block of code but in the merge target surrounding
(here: following) blocks have been removed. Now you get all of those
within the conflict marker. (Can't tell without the three versions
that have been requested.)

Andreas

-- 
"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800