create dev and add
modify dev
modify new master
Merge branch 'refs/heads/dev'

Conflicts:
	HelloGit.txt
modify new2
merge
Merge branch 'refs/heads/master' into dev

Conflicts:
	HelloGit.txt
merge finished
modify
modify
Merge branch 'refs/heads/dev'

Conflicts:
	HelloGit.txt