edit subbranch2
edit subbranch3
Merge branch 'subbranch1' into branch1