From: Junio C Hamano <junkio@cox.net>
Date: Sun, 01 May 2005 21:32:02 GMT
Subject: Re: [PATCH] Really fix git-merge-one-file-script this time.
Message-ID: <7v64y2skdp.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.58.0505011312080.2296@ppc970.osdl.org>

>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:

LT> In particular, I think the "apply the patch forward" (that cogito does) is
LT> as wrong with the "local modifications" as it is for the merge itself, and
LT> that a truly good merge would actually have _another_ three-way merge on
LT> the working file - the "original" is the version in our old HEAD branch,
LT> with the two branches being merged are "working copy before the merge" and
LT> "merge results".

Funny that I realize that is exactly how I've been doing my
merges with you.