Re: A note on merging conflicts..

From: Junio C Hamano <junkio@cox.net>
Date: Jul 1, 2006, 18:37 UTC
Message-ID: <7vfyhldvd2.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060701150926.GA25800@lsrfire.ath.cx>

I suspect this has the same problem I pointed out to Kristian's attempt to make git-branch a built-in.

    Subject: Re: [PATCH] Implement git-branch and git-merge-base as built-ins.
    Date: Thu, 08 Jun 2006 11:53:48 -0700
    Message-ID: <7vverbsclf.fsf@assigned-by-dhcp.cox.net>

Namely, merge-base code is not set up to be called more than once without cleaning things up.

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