Re: [PATCH v2 3/6] doc: git-rebase: link to new merge conflicts guide

[Junio C Hamano <gitster@pobox.com>]

"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Julia Evans <julia@jvns.ca>
>
> 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 <julia@jvns.ca>
> ---
>  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].