Re: jc/rerere-multi

Junio C Hamano writes: > Johannes Sixt writes: > >> Generally, the patches make sense. > > Thanks. As the tip commit says, this is still incomplete in that > "record and replay" part should work reasonably well, but things > like "forget" and "gc" are areas

jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20))

Am 21.01.2016 um 00:33 schrieb Junio C Hamano: > * jc/rerere-multi (2015-09-14) 7 commits > - rerere: do use multiple variants > - t4200: rerere a merge with two identical conflicts > - rerere: allow multiple variants to exist > - rerere: delay the recording of preima

Re: jc/rerere-multi

Johannes Sixt writes: > I finally found some time to test and review this series. I have one > case where there are many identical conflicts (up to 15!) that rerere > was unable to resolve. But with this series applied, all of them are > now resolved automatically and correctly.