This is an example exercise. The company Code&Bricks wants to develop a new E-commerce webapp. The dev team will develop a first 1.0.0 version including three features. Each of them will be released as soon as its developed.
All involved branches are pushed and left untouched so the exercise looks as clear as possible. Also will not squash features for this same purpose. Will use PRs with short branches. Ideally every feature would be squashed and merged and the branch would be deleted, then master would look nice and clean.
- f1 feature should be developed and delivered as soon as possible (release 0.1.0)
- f2 and f3 are developed in parallel
- f2 gets finished and released (release 0.2.0)
- a bug is found in prod, hotfix delivered (release 0.2.1)
- f3 gets finished and released, taking care of conflicts and including hotfix (1.0.0)
- New Feature 1 PR#1
- New Feature 2 PR#2
- Fix for Feature 2 bug PR#2
- New feature 3 PR#2