From: Johannes Schindelin Date: Wed, 18 Jun 2008 19:29:35 GMT Subject: Re: Guided merge with override Message-ID: In-Reply-To: <7viqw6zovi.fsf@gitster.siamese.dyndns.org> Hi, On Wed, 18 Jun 2008, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Thinking about this again, there could be a problem: in case of complex > > merges, it is possible that the sides are switched around for an > > intermediate merge. IOW you'd expect it to take "theirs", but it really > > takes "ours". > > Are you thinking about using this in merge-recursive? Indeed I was. > I do not think there is any reason to use this during intermediate > merges done inside merge-recursive. That is right, but for some stupid reason I did not realize that git-merge-file is not even called by merge-recursive. So the accompanying patch for merge-recursive would use the --theirs or --ours logic only in the !index_only case, i.e. the final merge. And I guess we'd have similar logic as for merge-subtree, introducing merge-recursive-ours and merge-recursive-theirs. Very nice. Ciao, Dscho