Re: Should rerere auto-update a merge resolution?

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Aug 23, 2017, 21:12 UTC
Message-ID: <CACPiFCJCgKtTbKX8jCSC3QgMKZ7Usu2ojqXe5w_QAHwk7T4M-A@mail.gmail.com>
In-Reply-To: <xmqqlgmaxbuc.fsf@gitster.mtv.corp.google.com>

On Wed, Aug 23, 2017 at 4:34 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 6 quoted lines

> 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.

Hi Junio!

thanks for the quick response.

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.

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

cheers,

-- 
 martin.langhoff@gmail.com
 - ask interesting questions  ~  http://linkedin.com/in/martinlanghoff
 - don't be distracted        ~  http://github.com/martin-langhoff
   by shiny stuff