From: Linus Torvalds <torvalds@osdl.org>
Date: Wed, 21 Sep 2005 20:20:34 GMT
Subject: Re: Please undo "Use git-merge instead of git-resolve in git-pull"
Message-ID: <Pine.LNX.4.58.0509211318550.2553@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.58.0509211310150.2553@g5.osdl.org>



On Wed, 21 Sep 2005, Linus Torvalds wrote:
> 
> If the new merge policies do not allow that, then the new merge policies 
> are incredibly broken.

I just checked.

It _is_ incredibly broken. 

It will do 

	echo "Rewinding the tree to pristine..."
	git reset --hard $head

if any merge strategy every fails, so that check is needed for the new 
merger.

This makes merges totally unusable. It feels like the dark ages.

		Linus