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

Re: Move-delete merge conflict is not displayed using git ls-files --unmerged

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 22, 2008, 20:48 UTC
Message-ID
<7v4p0whr7a.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<85647ef50812220629o46134a70waf159bb6cd6d6e72@mail.gmail.com>
"Constantine Plotnikov" <constantine.plotnikov@gmail.com> writes:
> I think that if git merge reports the conflicts, such conflicts should
> be discoverable using git ls-files and prevent commit with resolving
> the conflict like it is done with modify-delete conflicts.
Yeah, I think so, too.
Previous: Constantine PlotnikovNext: Johannes Schindelin
Message 2 of 5 in “Move-delete merge conflict is not displayed using git ls-files --unmerged”
  1. Constantine PlotnikovDec 22, 2008
  2. Junio C HamanoDec 22, 2008
  3. merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin, Dec 22, 2008
  4. Junio C HamanoDec 22, 2008
  5. Johannes SchindelinDec 23, 2008

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.