On 08/29, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > Yeah that makes sense. Maybe something like this?
> >
> > (replying to here to keep
> > the patches in one thread)
> >
> > Documentation/technical/rerere.txt | 4
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/Docum
Thomas Gummerer writes:
> Yeah that makes sense. Maybe something like this?
>
> (replying to here to keep
> the patches in one thread)
>
> Documentation/technical/rerere.txt | 4
> 1 file changed, 4 insertions(+)
>
> diff --git a/Documentation/technical/rerere.txt
> b/Documentation/techn
4af3220 ("rerere: teach rerere to handle nested conflicts",
2018-08-05) introduced slightly better behaviour if the user commits
conflict markers and then gets another conflict in 'git rerere'.
However this is just a heuristic to punt on such conflicts better, and
doesn't deal with any unmatched c
3 matches
Mail list logo
