git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philip Oakley <philipoakley@iee.email>
To: Edmundo Carmona Antoranz <eantoranz@gmail.com>,
	Git List <git@vger.kernel.org>
Subject: Re: conflict markers on recursive strategy with diff3 enabled
Date: Mon, 28 Oct 2019 22:13:02 +0000	[thread overview]
Message-ID: <e26d24b2-6fca-8546-f2b3-bf4660db8184@iee.email> (raw)
In-Reply-To: <CAOc6etaQvNChdRZ70xsYQxqtgmZVxaKV9K7_zZeET3JuQ4HEXg@mail.gmail.com>

Hi Edmundo ,

On 25/10/2019 01:13, Edmundo Carmona Antoranz wrote:
> Hi!
>
> I'm sitting down hunting for conflict examples and while looking
> through past conflicts in git I found one that has a format that I
> hadn't seen before. When merging the parents of 8b79343fc0 we get
> this:
>
> <<<<<<< HEAD
>
> /*
> * Unlink the .pack and associated extension files.
> * Does not unlink if 'force_delete' is false and the pack-file is
> * marked as ".keep".
> */
> extern void unlink_pack_path(const char *pack_name, int force_delete);
> ||||||| merged common ancestors
>>>>>>>>>> Temporary merge branch 2
> =======
>>>>>>>> 8b79343fc0^2
> That is with merge.conflictStyle set to diff3. What I would like to
> know is if the details about how the additional information that is
> not normally seen on a conflict has to be interpreted (to be read as
> "the part about the temporary branches").
- "Temporary merge branch"

I believe this happens when no merge-base is found between the two lines 
of development that are being merged, so a fake merge-base is created to 
allow the regular 3-way merge to occur.

It may be described in the technical section of the Documentation.

>   I see some explanation about
> it in [1] but when checking inside "git help merge" all I see is that
> when you are using diff3 you will get the content of the parent but
> there's more stuff than just that. Is it documented somewhere?
>
> Thanks!
>
> [1]https://stackoverflow.com/questions/31392513/git-diff3-conflict-style-temporary-merge-branch

Philip

  parent reply	other threads:[~2019-10-28 22:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-25  0:13 conflict markers on recursive strategy with diff3 enabled Edmundo Carmona Antoranz
2019-10-28 21:58 ` Elijah Newren
2019-10-28 22:13 ` Philip Oakley [this message]
2019-10-29  1:31   ` Junio C Hamano

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=e26d24b2-6fca-8546-f2b3-bf4660db8184@iee.email \
    --to=philipoakley@iee.email \
    --cc=eantoranz@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).