From: Petr Baudis Date: Tue, 27 Sep 2005 10:13:06 GMT Subject: Re: GIT 0.99.7d, and end of week status. Message-ID: <20050927101306.GC30889@pasky.or.cz> In-Reply-To: <7vr7bba3lo.fsf@assigned-by-dhcp.cox.net> Dear diary, on Tue, Sep 27, 2005 at 12:03:47AM CEST, I got a letter where Junio C Hamano told me that... > - if the merge is not to happen in the current branch, then > use a temporary index file and a temporary working directory > to do the merge -- when manual conflict resolution is needed, > ask the user to go to that temporary working directory and > resolve conflicts there and make commits there. The > temporary working directory is actually cheap because we do > not have to checkout all the paths -- only the paths involved > in the merge. By the way, this is how Cogito did merging for some (rather short) time period (actually, there's perhaps still some remnant of this, I think Cogito still by default ignores ,,merge* which was the subdirectory where the merge happenned). I removed it because IIRC the people weren't eventually all that excited about it after all and Linus changed his mind too. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.