Microsoft Certified: DevOps Engineer ExpertConfigure processes and communicationsEasy
A development team is implementing a new feature in an existing application. They want to ensure that the new code integrates smoothly with the main codebase and does not introduce regressions, while also allowing for parallel development. They decide to use a workflow where developers create isolated branches for new features, and changes are reviewed before being merged into the main branch. Which branching strategy best fits these requirements?
- AFeature Branching
- BGitFlow
- CForking Workflow
- DTrunk-Based Development
Show answer & explanationAnswer & explanation
Correct answer: A. Feature Branching
Feature Branching allows developers to work on new features in isolated branches, preventing direct interference with the main codebase. This strategy inherently supports code review before merging, ensuring quality and smooth integration. While GitFlow uses feature branches, the core concept of isolated development and review is characteristic of Feature Branching.
Why the other options are wrong
- B. GitFlow is a more complex branching model that utilizes feature branches but also includes release and hotfix branches, making it a specific implementation rather than the general strategy of isolated development.
- C. Forking Workflow is primarily used in open-source projects where contributors fork the main repository and then submit pull requests, which is more about collaboration across different repositories than internal team development isolation.
- D. Trunk-Based Development involves frequent, small commits directly to a single main branch, which doesn't align with isolated feature development and review.
Feature Branching
A branching strategy where all new development for a feature takes place in a dedicated branch, isolated from the main codebase.
- Promotes isolation of development efforts.
- Facilitates code review before merging.
- Reduces risk of regressions in the main branch.
Memory trick: Feature branches grow new ideas safely.