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

Re: git's behaviour during a 'both added' merge conflict

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 22, 2012, 18:49 UTC
Message-ID
<7vaa38xygt.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAFsnPqrqz+HZGJHWp6YEWKJeXO2jYDw-qYfAdtHhDvYVmeTD1w@mail.gmail.com>
Jeremy Morton <jeremy@configit.com> writes:
> I've noticed that when you're merging and there is a 'both added'
> merge conflict, git creates the .LOCAL and .REMOTE files for the
> merge, but not the .BASE file.
Strictly speaking, git doesn't, but I think mergetool may.
You may find this thread interesting:
  http://thread.gmane.org/gmane.comp.version-control.git/188776/focus=188867

which resulted in ec245ba (mergetool: Provide an empty file when needed, 2012-01-19); that change is in v1.7.9.1 and upwards IIRC.

Previous: Jeremy Morton
Message 2 of 2 in “git's behaviour during a 'both added' merge conflict”
  1. Jeremy MortonMar 22, 2012
  2. Junio C HamanoMar 22, 2012

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.