new branch1 add file a.txt
Merge branch 'branch1'
modified b.txt in branch2