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

Re: [PATCH] Avoid excessive rewrites in merge-recursive

From
Alex Riesen <raa.lkml@gmail.com>
Date
Apr 25, 2007, 22:13 UTC
Message-ID
<20070425221341.GH30061@steel.home>
In-Reply-To
<7vodlcup9e.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano, Wed, Apr 25, 2007 23:18:21 +0200:
Show 11 quoted lines
> 
> > Just as you may have thought merge-recursive cannot get any uglier
> > someone comes and does just this: puts another level of indentation.
> 
> It really was painful for me the last time I touched the file,
> so I share that feeling.  The complexity of this program is
> getting out of hand.
> 
> Probably we would want a refactoring before doing something like
> this.
>

I want. I just can't afford something like this lately. I'm even saving on "am"s and "not"s! :)

Previous: Junio C HamanoNext: Alex Riesen
Message 3 of 4 in “Avoid excessive rewrites in merge-recursive”
  1. Avoid excessive rewrites in merge-recursiveAlex Riesen, Apr 25, 2007
  2. Junio C HamanoApr 25, 2007
  3. Alex RiesenApr 25, 2007
  4. Ignore merged status of the file-level mergeAlex Riesen, Apr 26, 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.