Re: Should rerere auto-update a merge resolution?

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 25, 2017, 10:19 UTC
Message-ID: <alpine.DEB.2.21.1.1708251218460.7424@virtualbox>
In-Reply-To: <CACPiFCJCgKtTbKX8jCSC3QgMKZ7Usu2ojqXe5w_QAHwk7T4M-A@mail.gmail.com>

Hi Martin,

On Wed, 23 Aug 2017, Martin Langhoff wrote:

Show 13 quoted lines

> On Wed, Aug 23, 2017 at 4:34 PM, Junio C Hamano <gitster@pobox.com> wrote:
> > Between these two steps:
> >
> >>  - I reset hard, retry the merge, using --no-commit, rerere applies what it knows
> >>  - I fix things up, then commit
> >
> > You'd tell rerere to forget what it knows because it is wrong.
> 
> Questions
> 
>  - when I tell it to forget, won't it forget the pre-resolution state?
> my read of the rerere docs imply that it gets called during the merge
> to record the conflicted state.

In my hands, I need to tell rerere to forget, *and then recreate the merge conflict* before I can resolve it again and let rerere learn the new resolution.

>  - would it be a feature if it updated its resolution db
> automagically? rerere is plenty automagic already...

That would most likely be a very welcome feature here.

Thanks, Johannes