Re: [PATCH v3 0/6] [doc] Add new page on merge conflicts
"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 15 quoted lines
> Changed in v2:
>
> * Explain what a merge conflict is (thanks to Junio & Ben)
> * rewrite the "ours" vs "theirs" section (thanks to Patrick for the
> comments)
> * add git log --merge (thanks to Ben)
> * Leave most of the content of git cherry-pick as-is, to make this patch
> set smaller (thanks to Junio)
> * remove the SYNOPSIS since hopefully that won't be required anymore by the
> time this is merged
> * Fix a typo in git revert (s/reverted conflict/reverted commit/)
> * 's/the the/the/' (thanks to Patrick)
> * s/[doc] Thing/doc: thing/ in commit messages (thanks to Tuomas)'
> * squash the commit fixing the linter error (thanks to Junio)
> * list reviewers in Reviewed-by
I had some comments on diff3 in [1/6]; everything else looked good.
Thanks.