add b1-f1 from branch1
modify f1
Merge branch 'master' into branch1
add b2-f1
add b2-f2
Create newFromBranch1
Merge remote-tracking branch 'origin/branch1'