On 05/24, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > +Conflict normalization
> > +--
> > +
> > +To try and re-do a conflict resolution, even when different merge
> > +strategies are used, 'rerere' computes a conflict ID for each
> > +conflict in the file.
> > +
> >
Thomas Gummerer writes:
> +Conflict normalization
> +--
> +
> +To try and re-do a conflict resolution, even when different merge
> +strategies are used, 'rerere' computes a conflict ID for each
> +conflict in the file.
> +
> +This is done by discarding
Add some documentation for the logic behind the conflict normalization
in rerere. Also describe a bug that happens because we just linearly
scan for conflict markers.
Signed-off-by: Thomas Gummerer
---
This documents my understanding of the rerere conflict normalization
3 matches
Mail list logo