When you want to merge dev to your own branch (which you should do before pushing your branch up), here are your steps:
- git checkout dev
- git pull origin dev
- git checkout [featurebranchname]
- git merge dev (resolve any merge conflicts here)
- git push origin [featurebranchname]