How to merge updates from master into your branch

The master has been updated and you need to merge these changes into your branch.

Ensure that you are currently in your branch:

  git branch

Ensure that your local repository is up-to-date with Github:

  git remote update

Merge the changes from master into your branch:

  git merge master

Commit and push this update back to Github.