Hi Martin, On Wed, 23 Aug 2017, Martin Langhoff wrote: > 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. > > 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
