On Wed, Aug 23, 2017 at 4:34 PM, Junio C Hamano <gitster@xxxxxxxxx> 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. 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, m -- martin.langhoff@xxxxxxxxx - ask interesting questions ~ http://linkedin.com/in/martinlanghoff - don't be distracted ~ http://github.com/martin-langhoff by shiny stuff
