Re: Should rerere auto-update a merge resolution?

Junio C Hamano writes: > Junio C Hamano writes: > >> Martin Langhoff writes: >> >>> - when I tell it to forget, won't it forget the pre-resolution state? >> >> I do not recall the details of what I did ;-) so I played around a

Re: Should rerere auto-update a merge resolution?

Johannes Schindelin writes: > 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. I can believe that---that is how I originally desiged "forget" to behave.

Re: Should rerere auto-update a merge resolution?

Junio C Hamano writes: > Martin Langhoff writes: > >> - when I tell it to forget, won't it forget the pre-resolution state? > > I do not recall the details of what I did ;-) so I played around a > bit. Here is what I did: > ... > After git rerere

Re: Should rerere auto-update a merge resolution?

Martin Langhoff writes: > - when I tell it to forget, won't it forget the pre-resolution state? I do not recall the details of what I did ;-) so I played around a bit. Here is what I did: git checkout master^0 git merge --no-ff --no-edit

Re: Should rerere auto-update a merge resolution?

Hi Martin, On Wed, 23 Aug 2017, Martin Langhoff wrote: > On Wed, Aug 23, 2017 at 4:34 PM, Junio C Hamano 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 >

Re: Should rerere auto-update a merge resolution?

On Wed, Aug 23, 2017 at 4:34 PM, Junio C Hamano 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

Re: Should rerere auto-update a merge resolution?

Martin Langhoff writes: > Hi List! > > Let's say... > - git v2.9.4 > - rerere is enabled. > - I merge maint into master, resolve erroneously, commit > - I publish my merge in a temp branch, a reviewer points out my mistake > - I reset hard, retry the merge, using

Should rerere auto-update a merge resolution?

Hi List! Let's say... - git v2.9.4 - rerere is enabled. - I merge maint into master, resolve erroneously, commit - I publish my merge in a temp branch, a reviewer points out my mistake - I reset hard, retry the merge, using --no-commit, rerere applies what it knows - I fix things up, then