[git] first commit in feature branch
[git] cosmetic change
[git] second commit in feature branch
[git] merge branch 'newfeature' into develop