Merge branch

Select the branch to merge to

git checkout <master_branch>

Merge

Merge git merge [--no-ff] <working_branch>

no-ff : interim commits are compressed

Delete

Delete git branch -d <working_branch>

Push

Push git push origin <master_branch>

Choose one version over the other

git merge <branch> -X [ours | theirs]