On branch release-1.2
Changes to be committed:
  modified:   Version.txt
  set version to 1.2
 On branch release-1.2
 Changes to be committed:
  modified:   text.txt
  hallo
Merge branch 'release-1.2' into develop

Conflicts:
	Version.txt
Done!

 Changes to be committed:

	modified:   text.txt