COmmit to XXX
Commit to XXX 2
Commit No 3 to XXX
Commit to Master
Commit to Master 2
Commit to Master 3
Merge branch 'XXX'

Conflicts:
	src/HelloGit.java