After adding new branch "testing"
After checkout to "master" branch
after conflict
commit at master branch
commit in testing branch
commit in hotfix branch
completed work on "testing"
Merge branch 'testing'

Conflicts:
	mynewfile123.txt
a new line added by rupak
added in new branch
new line in other branch
del the mytest file