branch ?
add method to merge
Merge branch 'Branch1'

Conflicts:
	kba.git.testing/src/test/java/net/kba/git/testing/HelloWorldTest.java