From: Junio C Hamano Date: Fri, 09 Oct 2026 18:22:25 GMT Subject: Re: [PATCH v2 3/6] doc: git-rebase: link to new merge conflicts guide Message-ID: In-Reply-To: <72b12070455aaf659eab049571451d1369a1d804.1791547213.git.gitgitgadget@gmail.com> "Julia Evans via GitGitGadget" writes: > From: Julia Evans > > Remove some of the detail about how to handle a merge conflict, since > it's explained in detail in the new guide, and there probably isn't > enough detail anyway. > > Leave the steps since rebase is special and has a `--skip` option which > the other commands which cause merge conflicts don't have. > > Signed-off-by: Julia Evans > --- > Documentation/git-rebase.adoc | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) Great. There is nothing I would miss from these removed lines. All are already described better in the new document, with or without suggestions I made during reviews of [1/6] and [2/6].