Re: [PATCH 3/2] merge-trees script for Linus git

From: Linus Torvalds <torvalds@osdl.org>
Date: Apr 16, 2005, 05:02 UTC
Message-ID: <Pine.LNX.4.58.0504152152580.7211@ppc970.osdl.org>
In-Reply-To: <7v7jj3fjky.fsf@assigned-by-dhcp.cox.net>

On Fri, 15 Apr 2005, Junio C Hamano wrote:

> 
> I'd take the hint, but I would say the current Perl version
> would be far more usable than the C version I would come up with
> by the end of this weekend because:

Actually, it turns out that I have a cunning plan.

I'm full of cunning plans, in fact. It turns out that I can do merges even more simply, if I just allow the notion of "state" into an index entry, and allow multiple index entries with the same name as long as they differ in "state".

And that means that I can do all the merging in the regular index tree, using very simple rules.

Let's see how that works out. I'm writing the code now.

		Linus

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