Re: [RFC/PATCH 7/7] rerere: teach rerere to handle nested conflicts

On 05/24, Junio C Hamano wrote: > Thomas Gummerer writes: > > > No automated test for this yet. As mentioned in the cover letter as > > well, I'm not sure if this is common enough for us to actually > > consider this use case. I don't know how nested conflicts could > >

Re: [RFC/PATCH 7/7] rerere: teach rerere to handle nested conflicts

Thomas Gummerer writes: > No automated test for this yet. As mentioned in the cover letter as > well, I'm not sure if this is common enough for us to actually > consider this use case. I don't know how nested conflicts could > actually be created apart from committing a

[RFC/PATCH 7/7] rerere: teach rerere to handle nested conflicts

Currently rerere can't handle nested conflicts and will error out when it encounters such conflicts. Do that by recursively calling the 'handle_conflict' function to normalize the conflict. The conflict ID calculation here deserves some explanation: As we are using the same handle_conflict