Re: [PATCH v4 10/11] rerere: teach rerere to handle nested conflicts
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Aug 22, 2018, 11:00 UTC
- Message-ID
- <CACBZZX6xvsZ4K86b53ura6zENs2p0SBjwYYG=h0TNem3wnEbuQ@mail.gmail.com>
- In-Reply-To
- <20180805172037.12530-11-t.gummerer@gmail.com>
On Sun, Aug 5, 2018 at 7:23 PM Thomas Gummerer <t.gummerer@gmail.com> 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.