Until project increases in size and complexity, Git workflow should be kept as simple as possible. Follow these guidelines for branching and development:
-
Every task should have its own branch.
-
Final work is submitted as pull request to the
master
branch for code review. Don't do any work and commits inmaster
branch. -
Merge in
master
branch using--squash
flag and write commit messages following commit guidelines. This ensures that Git log and changelog both match work assigned. -
Merge to
master
branch should be done only after sucessfull code review. -
Make sure to clean remote repo from unused branches when ending a sprint to prevent generating unnecessary noise.