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 commit
So far so good.
Oops! One of the branches has moved forward in the meantime, so
- git fetch
- git reset --hard master
- git merge maint
... rerere applies the first (incorrect) resolution...
Am I doing it wrong? {C,Sh}ould rerere have done better?
cheers,
m
--
[email protected]
- ask interesting questions ~ http://linkedin.com/in/martinlanghoff
- don't be distracted ~ http://github.com/martin-langhoff
by shiny stuff
