From: David Kastrup <dak@gnu.org>
Date: Thu, 30 Jan 2014 11:24:31 GMT
Subject: Re: Strange merge output.
Message-ID: <87y51x4sr4.fsf@fencepost.gnu.org>
In-Reply-To: <55DE3FAC-BD7E-4AB2-8A18-CF85BB859465@kameleoon.com>

Vincent Bernardi <vincent@kameleoon.com> writes:

> Hi,
> I asked about this problem on #git@freenode and someone suggested I
> submit it to this list. I have a case where the output of a merge
> gives a conflict and produces the following file:
>
> Code Block A
> <<<<<<< HEAD
> =======
> Code Block B
>>>>>>>> branch-B
> Code Block B' (similar to code block B but not exactly the same).
>
> Here is what HEAD looks like 
> Code Block A
> Code Block B' 
>
> and branch-B:
> Code Block A
> Code Block B
>
> I thought that taking a conflicted file like above and removing the
> three following lines:
> <<<<<<< HEAD
> =======
>>>>>>>> branch-B
>
> was supposed to produce *exactly* the branch-B version?

No?  It will produce the branch-B version in the conflicted area, but
that does not mean that conflict resolution might not have been done
outside of that area.

-- 
David Kastrup