Re: [PATCH] An attempt to resolve a rename/rename conflict in recursive merge

From: Alex Riesen <raa.lkml@gmail.com>
Date: Mar 29, 2007, 23:13 UTC
Message-ID: <20070329231308.GF2809@steel.home>
In-Reply-To: <20070329230156.GE2809@steel.home>

Alex Riesen, Fri, Mar 30, 2007 01:01:56 +0200:

Show 5 quoted lines

> 
> I just left all three entries in the index for the virtual commit to
> pick them up: it'll usually(always?) generate a conflict which has to
> be resolved manually. Many times, perhaps.
>

Nah, doesn't do anything good. Does not crash, though.

$ 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.