Re: Handling merge conflicts a bit more gracefully..

On Wed, 8 Jun 2005, Junio C Hamano wrote:

I do not think you can, unless you are willing to parse shell
error messages, which I do not want you to be willing to ;-).

Yeah, no. 

I think you have a bigger problem of leading paths, BTW.

Gotcha. I committed a largely untested fix that hopefully does this all 
right.

I'm currently using your suggested thing (inside a function), but I think 
I'll instead make it do

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

which seems even simpler.

		Linus