Re: [PATCH 0/7] [doc] Add new page on merge conflicts

From: Jeff King <peff@peff.net>
Date: Sep 24, 2026, 23:37 UTC
Message-ID: <20260924233726.GB765100@coredump.intra.peff.net>
In-Reply-To: <xmqq33uyz3yp.fsf@gitster.g>

On Thu, Sep 24, 2026 at 03:20:30PM -0700, Junio C Hamano wrote:

Show 23 quoted lines

> "Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 
> > Julia Evans (7):
> >   [doc] Add new gitmergeconflicts man page
> >   [doc] git-merge: link to new merge conflicts guide
> >   [doc] git-rebase: link to new merge conflicts guide
> >   [doc] git-revert: link to new merge conflicts guide
> >   [doc] git-cherry-pick: link to new merge conflicts guide
> >   [doc] git-pull: link to new merge conflicts guide
> >   [doc] ignore conflict markers in gitmergeconflicts.adoc
> 
> With this merged, 'seen' seems to fail
> 
> 	$ make check-docs
> 
> with these lines at the end
> 
>             ...
>             MKDIR -p .build/lint-docs/doc-style/includes
>             LINT DOCSTYLE includes/cmd-config-section-all.adoc
>             LINT DOCSTYLE includes/cmd-config-section-rest.adoc
>             GEN lint-docs-manpages
>         no link: gitmergeconflicts

Weirdly applying Julia's patches myself did not result in the same error. It's only when they're merged to seen. Ah. It's due to ta/command-list-guides-sync-lint, which isn't yet in master.

I think that is giving us a good signal, though. The guide should be mentioned in command-list.txt, so that it is linked from git(1). See c655855559 (doc: git: list gitdatamodel(7) as a concept guide, 2026-09-05) for some prior art.

-Peff