Git Flow
Set of traffic rules for managing how multiple people work together on a software project. It helps everyone know when and where they can "drive" their changes into the project without causing crashes (i.e., conflicts or issues).
Think of a branch as a parallel universe for your project where you can develop features, fix bugs, or experiment with new ideas without affecting the main project's stability.
Where the final product lives, always in a ready-to-use state.
Where all the work in progress gathers and gets tested together.
Individual paths where each person works on their new features, away from the main traffic, until their work is ready to merge into the development lane.
Short stretches where final adjustments are made before merging into the main and development lanes.
Quick paths to fix any sudden problems on the main lane, which are then merged back to keep everything running smoothly.
- Before starting to code, find a partner to define tests for the given task
- Create a branch for the given task
- Create a Pull Request when code is ready to be reviewed
- Find someone to review your code
- Tests must also be reviewed
- Discuss any proposed changes
- Document changes in wiki
- Merge Pull Request into
developbranch