1.1)
branchm → branch

1.3)
options how → options for how

2.5)
This is demonstrated with the following command → this is repeated in both the first and second paragraphs.

2.6)
specify here the → specify the
reflected to → preserved in

there are ? placeholders in 3.1), 7.1), 7.2), and 7.3) which should be replaced with their intended content

5.1)
Merge conflict A conflict → A conflict

6)
Should this section start with "Sometimes if?"? The preceding text is fairly incomprehensible and appears to have originally been intended for markup.

8)
Unlike 5), 8) doesn’t actually talk about solving, so it should probably just be called Rebase Conflicts

8.1)
Rebase conflict During → During

11)
new commit of the version → new commit or the version
than to solve → than solving
i.g. → i.e.