From: Daniel Barkalow <barkalow@iabervon.org>
Date: Thu, 22 Sep 2005 21:57:36 GMT
Subject: Re: Please undo "Use git-merge instead of git-resolve in
Message-ID: <Pine.LNX.4.63.0509221747340.23242@iabervon.org>
In-Reply-To: <Pine.LNX.4.58.0509221427520.2553@g5.osdl.org>

On Thu, 22 Sep 2005, Linus Torvalds wrote:

> Basically: having dirty state in your tree and then ending up having to do 
> a manual merge is a big pain. Not worth it. I just keep really small dirty 
> stuff so that I don't mind blowing it away if I need to.

Would it be worthwhile to have a flag to make git-read-tree abort rather 
than making a mess if you have any dirty state and the merge isn't 
completely automatic? It's certainly easy enough to write.

	-Daniel
*This .sig left intentionally blank*