From: Junio C Hamano Date: Fri, 23 Oct 2026 16:06:35 GMT Subject: Re: [PATCH v4 0/6] [doc] Add new page on merge conflicts Message-ID: In-Reply-To: "Julia Evans via GitGitGadget" writes: > Handling merge conflicts is difficult, and currently Git's guidance on merge > conflicts isn't giving users the information they need to navigate the > process. As usual, the process I used to write this was to collect comments > from Git users on the existing documentation, and then address those issues. > I listed the specific issues we're aiming to solve in the first commit > message in the series. $ make check-docs GIT_VERSION=2.56.0.rc2.6.gf97f562a2c make -C Documentation lint-docs make[1]: Entering directory '/home/gitster/w/git/Documentation' LINT MAN SEC gitmergeconflicts.adoc gitmergeconflicts.adoc:339: has no required 'SYNOPSIS' section!