feature1-1 + commit1
feature1-1 + commit 2
Merge branch 'feature/feature1-1'
Merge branch 'hotfix/hotfix1'

Conflicts:
	gitflowcommits.txt
Merge branch 'hotfix/hotfix2'
master commit1
master commit2
master commit3
Merge branch 'master' into store