From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 11 Aug 2008 11:32:57 GMT
Subject: Re: [PATCH v2] Make cherry-pick use rerere for conflict resolution.
Message-ID: <alpine.DEB.1.00.0808111328590.24820@pacific.mpi-cbg.de.mpi-cbg.de>
In-Reply-To: <20080811104006.GH32184@machine.or.cz>

Hi,

On Mon, 11 Aug 2008, Petr Baudis wrote:

>   this makes revert use rerere too, right?

That would actually be a problem, no?  I am not sure that resolutions for 
reverts make sense for cherry-picks, so I am not sure if resolutions 
should be recorded for reverts.

Thanks for bringing up that point,
Dscho