branch feature_x commit
branch master commit
Merge branch 'master' into feature_x