# Merge with squash so it's clean
merge feature-branch master --squash
git checkout master
git commit -a
# Remove local and remote branch
git branch -d feature-branch
git push origin --delete feature-branch