From: David Kastrup <dak@gnu•org>
To: git@vger•kernel.org
Subject: Re: Strange merge output.
Date: Thu, 30 Jan 2014 12:24:31 +0100 [thread overview]
Message-ID: <87y51x4sr4.fsf@fencepost.gnu.org> (raw)
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
prev parent reply other threads:[~2014-01-30 11:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-30 10:52 Strange merge output Vincent Bernardi
2014-01-30 11:24 ` David Kastrup [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y51x4sr4.fsf@fencepost.gnu.org \
--to=dak@gnu$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox