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

Re: [PATCH 4/5] merge-recursive: handle D/F conflict case more carefully.

From
Alex Riesen <raa.lkml@gmail.com>
Date
Apr 9, 2007, 18:58 UTC
Message-ID
<20070409185809.GA13212@steel.home>
In-Reply-To
<7v6488ckk0.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano, Sat, Apr 07, 2007 16:42:55 +0200:
> +			if (unlink(path)) {
> +				if (errno == EISDIR) {
> +					/* something else exists */
> +					error(msg, path, ": perhaps a D/F conflict?");
isn't this one an F/D conflict?
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 5 in “merge-recursive: handle D/F conflict case more carefully.”
  1. 4/5 merge-recursive: handle D/F conflict case more carefully.Junio C Hamano, Apr 7, 2007
  2. Alex RiesenApr 9, 2007
  3. Junio C HamanoApr 9, 2007
  4. Alex RiesenApr 10, 2007
  5. Junio C HamanoApr 10, 2007

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.