I\'m working on a team with a few developers using git on BitBucket. We are all working on a dev branch, not pushing to master until a release.
dev
master
You need to input:
$ git pull $ git fetch $ git merge
If you use a git push origin master --force, you will have a big problem.
git push origin master --force