From: Junio C Hamano Date: Wed, 18 Jun 2008 16:31:13 GMT Subject: Re: Guided merge with override Message-ID: <7viqw6zovi.fsf@gitster.siamese.dyndns.org> In-Reply-To: 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? I do not think there is any reason to use this during intermediate merges done inside merge-recursive. The point of recursive merge is to create a neutral intermediate merge result, with conflicts and all. Do this only during the final round and you are fine (for some definition of "fine" --- I still have not heard a convincing argument as to why it is even a good thing to be able to take one side for only parts that did conflict, while taking the change from the other side in places that did not).