The branch-based Git workflow helps your team collaborate seamlessly. By making sure that every change is reviewed, you get a useful trail of changes in the form of pull requests and merge commits.
- Everything you do has to be reviewed by someone else.
- It should be easy to review other people's work.
- All work happens in feature branches and have pull requests.
- Nobody should ever commit directly into
- Set up a staging system to test the latest version.
The main branches
developis always ready for developers and testers.
masteris always ready for users.
- Create a feature branch.
- Send a pull request for this feature branch into
- Your team will need to review and merge this pull request.
- Create a GitHub release.
Deploying emergency hotfixes
- Create a branch from
- Send a pull request for this branch into
- Create a staging system that looks like your production system.
- Set up CI to auto-deploy to staging whenever tests pass.
This git workflow is based on git-flow.
Done! Go back to the table of contents.