From: Junio C Hamano <junkio@cox.net>
Date: Thu, 09 Jun 2005 01:04:12 GMT
Subject: Re: Handling merge conflicts a bit more gracefully..
Message-ID: <7v4qc8z6gj.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.58.0506081738000.2286@ppc970.osdl.org>

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

LT> I'll instead make it do

LT> 	git-update-cache --add --cacheinfo ... &&
LT> 		git-checkout-cache -u -f "$4"

LT> which seems even simpler.

I like that one much much better.  Consistently using
checkout-cache -f everywhere is much preferred.  It creates the
leading paths itself, and even nukes interfering files it finds
while creating leading directories, which the verify_path using
mkdir -p would not give you.