commit of anewfile
commit of testfile
commit on master with text in testfile
commit on mybranch with text in testfile
commit on master fixing conflict in testfile