...
Get all the changes locally:
git fetch --all.Switch to master:
git switch master.Merge the changes from upstream:
git merge upstream. If everything has been done right, this will be a fast-forward merge, with no explicit merge commit.Push the changes to your fork to keep it up to date:
git push origin master.
...