When merging to a non-feature branch you'd normally use git merge <branch>. You can do better for the sake of easier reverts and help the review process:
git merge --no-ff <branch>
The naive way to update from upstream is git pull but is better to try:
git up