branch1:add branch1.c
branch1:add 1 in branch1
branch2:add branch2.c
branch2:add 1 in branch2
Merge branch 'branch2' into branch1