It’s better to use master branch only for Production and development branch for Staging. Each developer should create local branch to add new features and then merge with development branch. If you’re new to a git, try to use – http://github.com/nvie/gitflow There is also good picture describing git branching model – http://nvie.com/posts/a-successful-git-branching-model/