branch2
branch1
branch1_1
branch2_2
master1_1
branch2 into master
冲突解决