Re: A note on merging conflicts..

From: Linus Torvalds <torvalds@osdl.org>
Date: Jul 2, 2006, 00:08 UTC
Message-ID: <Pine.LNX.4.64.0607011704060.12404@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0607011905030.9789@iabervon.org>

On Sat, 1 Jul 2006, Daniel Barkalow wrote:

> 
> But that wouldn't actually affect b...c, because we don't actually care 
> that 'e' is the correct merge-base and 'g' is not, because "b c ^e ^g" is 
> the same as "b c ^e".

You're right - in ths case we don't care about a minimal base commit set at all, it's fine to have too many.

I think your patch to do the LEFT/RIGHT thing in git-rev-list internally, instead of generating it as part of the command line, looks fine in theory.

Except I think you need to set "revs->limited" for that case too (normally it gets set by "handle_commit()", and only if there is an UNINTERESTING commit: we'd need to add code to set it for LEFT/RIGHT commits too.

		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.