Choose a branching strategy for my team
Picks a Git branching approach for my team size and release rhythm, with the trade-offs and the first three rules to write down.
Task:
Recommend one Git branching strategy for my team and show how we would adopt it.
Context:
We are [team size] developers working on [kind of product]. We release [release rhythm]. Today we [current practice]. Our hosting service is [Git hosting service].
Rules:
- Compare at most three common strategies in one line each, then pick one and say why it fits our release rhythm.
- Name the main trade-off of the pick and what would make you change the recommendation.
- Describe branch protection and merge settings in general terms, and tell me to check the exact option names in my hosting service's settings.
- Explain any history-rewriting or force-push step before you recommend it, and say when it should never be used on a shared branch.
Result:
A numbered adoption plan of at most seven steps, each with an owner role. End with the three rules to write in the team handbook, one sentence each.