m2 commit
m3! commit
m4 commit
branch1@m2 commit
branch1@m2 commit2
Merge branch 'branch1@m2' with master

Conflicts:
	HelloGit/bin/HelloGit.class
	HelloGit/src/HelloGit.java