git workflow

git fetch upstream

stores new code in "upstream/master"

git commit

git merge upstream/master

git push origin master

GitHub - create pull request

GitHub - merge pull request