added ignore file
added file to branch1
added branch2.txt in branch2
updating on branch master
branch 1 committed
update to branch2
Merge branch 'branch1'
Merge branch 'branch2'