Microsoft DevOps Engineer Expert AZ-400 Practice Question

Your team maintains an Azure Repos Git repository that currently follows a GitFlow-style model with long-lived develop and release branches. Because of frequent merge conflicts and slow integration, leadership asks you to redesign the branching strategy. New requirements are:

Developers must integrate code to a shared branch several times a day.
Feature work should remain isolated until it is ready but avoid long-running divergence.
A short-lived branch for production hotfixes must be possible without disrupting ongoing work. Which branching approach best meets all the requirements?

Adopt trunk-based development with short-lived feature branches and on-demand hotfix branches cut from production tags.
Switch to a permanent release branch that all developers integrate into instead of main.
Implement a standard GitFlow model with develop, feature, release, and hotfix branches.
Use a forking workflow where each developer works in a personal fork and submits pull requests to the central repository.

Report Issue

Answer Description

Trunk-based development keeps a single shared main branch that developers integrate with multiple times per day, minimizing merge debt. Small, short-lived feature branches can be created from main and merged back quickly, satisfying the isolation requirement without long divergence. If an urgent production defect occurs, a separate hotfix branch can be cut from the current production tag, fixed, and merged back into main-allowing rapid releases while ongoing work continues. GitFlow and similar models use long-lived develop and release branches, which conflict with the need for constant integration. Forking flow requires cloning the whole repository per contributor and does not inherently address hotfix handling or frequent integration. A single permanent release branch likewise contradicts the mandate to avoid long-running divergence.

Ask Bash

Bash is our AI bot, trained to help you pass your exam. AI Generated Content may display inaccurate information, always double-check anything important.