Adding testing.txt to the testing branch
Adding master.txt to the master branch
Adding other.txt to the file
Merge branch 'hotfix'
Addint newbracnh.txt
Adding b2.txt to branch
removing all .txt files
Adding in m.txt to master
Updating m.txt with Branch2
Updateing m.txt in the master branch
Resolving merge conflict on m.txt