From: Linus Torvalds Date: Sun, 02 Jul 2006 00:08:54 GMT Subject: Re: A note on merging conflicts.. Message-ID: In-Reply-To: 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