冲突测试 master修改
人工解决冲突 保留branch的修改
Merge pull request #8 from RogerJin0910/br

pull request  在remote上merge
br2修改text2
br3
Merge pull request #9 from RogerJin0910/br

br1
Revert "br2修改text2"

This reverts commit 07f223b65cd8c30354cf95044642438fccc3cbcb.
br2.txt
Merge pull request #10 from RogerJin0910/br2

Br2
Revert "br3"

This reverts commit 32d3b16bcdbf4d90c84eb7305d700c7b8cc33955.
br3
Merge pull request #11 from RogerJin0910/br3

Br3
Merge pull request #12 from RogerJin0910/master

把br2和br3 merge到master上的修改 pull到br上