Re: A note on merging conflicts..

From: Junio C Hamano <junkio@cox.net>
Date: Jul 1, 2006, 19:56 UTC
Message-ID: <7vzmftcd60.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <44A6CD1D.2000600@lsrfire.ath.cx>

Rene Scharfe <rene.scharfe@lsrfire.ath.cx> writes:

> I wonder why the two clear_commit_marks() calls at the end of
> get_merge_bases() are not sufficient, though.

I missed to notice that Johannes had added those calls there; we should remove them from get_merge_bases().

The normal case of git-merge-base calling get_merge_bases() once and exiting should NOT have to pay for the clean-up cost at all.

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