Junior — Middle
Have you had experience with the Trunk-Based Development branching strategy in Git?
sobes.tech AI
Answer from AI
Trunk-Based Development (TBD) is a branching strategy in Git where developers mainly work in a single main branch (usually master or main). Branches are created only for very short tasks and quickly merged back into trunk.
Main features:
- Minimal number of long-lived branches.
- Frequent commits to the main branch.
- Use of feature toggles to control new features.
Advantages:
- Simplifies integration and reduces conflicts.
- Allows for faster delivery of changes.
Example workflow:
# Create a short-lived branch for a task
git checkout -b feature/new-login
# Work and commit
git commit -am "Add new login UI"
# Quickly merge into main
git checkout main
git merge feature/new-login
# Delete the branch
git branch -d feature/new-login
I used TBD in projects with frequent releases and CI/CD, which helped maintain stability and development speed.