Workflow

Do all your work in your local feature branch (constant commits but no push)

Done and ready to pull:

1. Do a final commit in your feature branch
2. Checkout local master branch
3. git pull origin master
4. Checkout local feature branch
5. git merge master
6. Fix any merge conflict (usually accepting incoming changes in files you didn't edit) 6.a) After fixing conflicts do a commit 6.b) git merge master should now say All up to date
7. git status if up to date git push origin feature-branch or commit and push
8. Create a pull request for your branch. Someone else will review and approve the merge