Your team uses a monorepo in Azure Repos with multiple feature branches. You notice that merge conflicts frequently occur because developers are working on the same files. You want to reduce conflicts and improve collaboration. Which branching strategy should you recommend?
Trap 1: Use release branches for each deployment and cherry-pick commits…
Release branches do not address frequent merge conflicts.
Trap 2: Use a single main branch and require all changes to be committed…
Direct commits to main are risky and can cause conflicts.
Trap 3: Use GitFlow with separate develop and release branches.
Long-lived branches increase merge conflicts.
- A
Use release branches for each deployment and cherry-pick commits from main.
Why wrong: Release branches do not address frequent merge conflicts.
- B
Use trunk-based development with feature flags to merge small, frequent changes.
Short-lived branches and feature flags reduce conflicts.
- C
Use a single main branch and require all changes to be committed directly.
Why wrong: Direct commits to main are risky and can cause conflicts.
- D
Use GitFlow with separate develop and release branches.
Why wrong: Long-lived branches increase merge conflicts.