comitt  edit aa.txt  bran01-a
edit aa.txt [hotfix2]
Merge branch 'bran02-a'

Conflicts:
	aa.txt