On Sun, Aug 5, 2018 at 7:23 PM Thomas Gummerer <t.gummerer@xxxxxxxxx> wrote: Late reply since I just saw this in next. > 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. > [...] Makes sense. > --- a/Documentation/technical/rerere.txt > +++ b/Documentation/technical/rerere.txt But why not add this to the git-rerere manpage? These technical docs get way less exposure, and in this case we're not describing some interna implementation detail, which the technical docs are for, but something that's user-visible, let's put that in the user-visiblee docs.
