On Tue, Jul 29, 2008 at 04:43:53PM -0700, Junio C Hamano <gitster@xxxxxxxxx> wrote: > By the way, this eval shows why "theirs" cannot be a symmetric operation > of "ours". You are taking the last remote HEAD even when you are merging > more than one remote into the current branch at once. "ours" can be > sensibly defined for an octopus, but "theirs" has this "which theirs" > problem ;-) Oh, well, sure. But _if_ it turns out there is a demand for that kind of git-merge-theirs, then I suppose we could still give up if we are given two or more remotes, just like merge-resolve and others do.
Attachment:
pgpPXMHn4qpRm.pgp
Description: PGP signature
