- Use the gitflow workflow
- work on a feature branch
- use meaningful branch names (feature/UC101 for use case 101 for example)
- merge to develop branch
- the develop branch should build and run at all times
- branch frequently
- commit frequently
- merge frequently
- always pull development first
- merge your feature into development localy
- push development