#unix #bash #git
Sometimes the easiest way to merge is using a terminal:
git merge feature -m "Merge feature into master"
This requires the current branch to be master as the merge is always going into the current branch. The above creates a new commit for the current branch, in this case master.