git/list[1] front-page[2] threads[3] people[4] search[5] about
 

conflict markers on recursive strategy with diff3 enabled

From
Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date
Oct 25, 2019, 00:13 UTC
Message-ID
<CAOc6etaQvNChdRZ70xsYQxqtgmZVxaKV9K7_zZeET3JuQ4HEXg@mail.gmail.com>
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"). 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
Next: Elijah Newren
Message 1 of 4 in “conflict markers on recursive strategy with diff3 enabled”
  1. Edmundo Carmona AntoranzOct 25, 2019
  2. Elijah NewrenOct 28, 2019
  3. Philip OakleyOct 28, 2019
  4. Junio C HamanoOct 29, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.