Re: A note on merging conflicts..

From: Junio C Hamano <junkio@cox.net>
Date: Jul 1, 2006, 20:07 UTC
Message-ID: <7vveqhccnk.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0607011301480.12404@g5.osdl.org>

Linus Torvalds <torvalds@osdl.org> writes:

Show 6 quoted lines

> On Sat, 1 Jul 2006, Rene Scharfe wrote:
>> 
>> I wonder why the two clear_commit_marks() calls at the end of
>> get_merge_bases() are not sufficient, though.
>
> Why does that thing check for "parent->object.parsed"?

Oh, I thought I fixed that up when I merged.  Sorry.

> Also, it only clears commit marks if they are contiguous, but some commit 
> marking may not be dense (eg, the "UNINTERESTING" mark may have been set 
> by (PARENT1 && PARENT2) triggering, but is not set in the commits that 
> reach it.

That is true.

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