merge of feature branch with master
git checkout master
git merge --no-ff FeatureBranch