git checkout master
git pull upstream master
git push origin master
git checkout -b feature-branch
git push -u origin feature-branch
git checkout master
git pull upstream master
git push origin master
git checkout feature-branch
git rebase master
git reset master
# stage and commit files however you want
git push -f origin feature-branch