Branch strategy affects integration delay and release coordination. Choose it from deployment needs rather than assuming one model fits every team.
Before you start
You should understand commits, branches, the working tree and the staging area. Draw the commit graph before changing history. Try commands in a disposable repository with a clean working tree so you can observe exactly which references and files each operation changes.
The practical goal is to reason through this situation: Short-lived branches reduce divergence when changes are integrated frequently. Read the walkthrough first, then try the interview exercise before opening its answer. The important part is explaining the decision and its consequences, rather than remembering a definition alone.
Step-by-step walkthrough
Step 1: Start with release needs
Identify deployment frequency and maintained versions.
Step 2: Minimize divergence
Integrate feature work frequently where the release model permits it.
Step 3: Define maintenance ownership
Specify backport and version-support rules explicitly.
Worked scenario
Short-lived branches reduce divergence when changes are integrated frequently.
A team deploying continuously can use short-lived feature branches while maintaining separate supported release branches. Long-lived feature isolation postpones integration conflicts until later. A branching diagram does not solve coordination unless the team also defines when changes integrate and which versions receive a fix.
Common mistake
Long-lived isolation can postpone conflicts until a risky release window.
Verify the behavior
Trace one feature, one hotfix and one backport through the policy.
Interview exercise
Support multiple maintained versions.
Answer and reasoning
Define maintenance branches and backport rules while keeping feature integration and release ownership explicit.
Continue learning
Compare the scenario with the Git and CI/CD interview questions and test your understanding with the Git and CI/CD MCQs. For terminology and implementation details, consult the reference material.