commit on feature-1 (created by dev1) on dev2
commit on develop on dev2
Finish feature-1 by dev2

Conflicts:
	abcDirect.txt
commit for release-1 on dev2
Finish release-1