Re: Please undo "Use git-merge instead of git-resolve in

From: Linus Torvalds <torvalds@osdl.org>
Date: Sep 22, 2005, 22:05 UTC
Message-ID: <Pine.LNX.4.58.0509221500150.2553@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.63.0509221747340.23242@iabervon.org>

On Thu, 22 Sep 2005, Daniel Barkalow wrote:

> 
> 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.

I don't think it would be wrong, necessarily.

On the other hand, it might be easier to just instead do a

	git diff HEAD > .git/pre-merge-diff

and let it go at that. If the merge ends up being nasty, you can then just do

	git reset --hard
	git-apply .git/pre-merge-diff

or something.

I dunno. This is not something that has caused me a lot of headache. I certainly _hope_ that people generally don't keep a lot of dirty state around: I do it for truly small stuff that I don't care about.

Let's face it - if I cared about it, I'd have committed it (possibly to another branch). It's not like that's hard. So the dirty stuff really does tend to be only trivial things.

		Linus