Branch2: add 'branch2.txt'
Branch2: edit branch2.txt
Merge remote-tracking branch 'origin/branch2'