edit featureA
edit merge featureA
Merge branch 'featureA'