From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 22 Apr 2010 00:26:41 GMT
Subject: Re: 'git notes merge' implementation questions
Message-ID: <20100422002641.GA29452@progeny.tock>
In-Reply-To: <201004220155.12747.johan@herland.net>

Johan Herland wrote:

> Thanks, I'm definitely coming around to the idea that having the user freely 
> resolve conflicts in a temporary worktree (that preferably contains only the 
> conflicting notes) is better than trying to resolve conflicts _without_ a 
> worktree.

Junio did a good job of making both interfaces --- no-resolution and
resolution-in-a-worktree --- sound very appealing.

Thanks for the hard work,
Jonathan