git merge b1 b2
有冲突，解决冲突合并
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.
此时分支的状态(master|MERGING)
不解决冲突，回到合并前的状态
git reset --merge
回到当前分支
git merge b1 b2
有冲突，解决冲突合并
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit the result.
此时分支的状态(master|MERGING)
不解决冲突，回到合并前的状态
git reset --merge
回到当前分支