From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 11 Aug 2008 11:49:33 GMT
Subject: Re: [PATCH v2] Make cherry-pick use rerere for conflict resolution.
Message-ID: <48A0274D.8090504@viscovery.net>
In-Reply-To: <alpine.DEB.1.00.0808111328590.24820@pacific.mpi-cbg.de.mpi-cbg.de>

Johannes Schindelin schrieb:
> 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.

Of course they should. If the reversal is part of a topic branch that you
rebase at least once, then you want to have the resolutions recorded,
don't you?

-- Hannes