This AZ-400 practice question tests your understanding of design and implement a source control strategy. Match the stated requirement to the specific cloud service, access model, or configuration option — many options are valid in isolation but not for this scenario. After answering, compare your reasoning against the explanation and wrong-answer breakdown below. Once you have made your selection, read the full explanation to reinforce the concept and understand why each distractor is designed to mislead on exam day.
Your team is migrating from TFVC to Git in Azure Repos. Developers frequently work on the same files simultaneously. Which Git workflow should you recommend to minimize merge conflicts?
Clue words in this question
Noticing these words before you look at the options changes how you read each choice.
Clue: "minimum / minimize"
Why it matters: Asks for the least resource use — fewest addresses, smallest subnet, lowest overhead. Eliminate over-provisioned options even if they would technically work.
GitFlow
Why wrong: GitFlow has long-lived branches that often diverge, increasing conflict potential.
Forking workflow
Why wrong: Best for external contributions, not internal team collaboration.
Feature branch workflow
Short-lived feature branches merged frequently reduce conflicts.
Centralized workflow
Why wrong: Similar to TFVC, does not use branching effectively.
Answer choices
Answer the question above first, then reveal the full breakdown to understand why each option is right or wrong.
Correct answer & explanation
Feature branch workflow
The feature branch workflow is ideal for minimizing merge conflicts when developers work on the same files simultaneously because each developer creates a short-lived branch off the main branch for their specific feature or fix, commits frequently, and merges back via pull requests. This isolates changes until they are ready, reducing the surface area for conflicts compared to long-lived branches. Git's merge or rebase strategies within this workflow allow for incremental conflict resolution, which is more manageable than resolving large conflicts from divergent histories.
Key principle: Answer the scenario, not the keyword: identify the specific constraint before choosing the most familiar-sounding option.
Answer analysis
For each option: why learners choose it and why it is or isn't the right answer here.
GitFlow
Why it's wrong here
GitFlow has long-lived branches that often diverge, increasing conflict potential.
Forking workflow
Why it's wrong here
Best for external contributions, not internal team collaboration.
Feature branch workflow
Why this is correct
Short-lived feature branches merged frequently reduce conflicts.
Clue confirmation
The clue word "minimum / minimize" in the question point toward this answer.
Related concept
Read the scenario before looking for a memorised answer.
Centralized workflow
Why it's wrong here
Similar to TFVC, does not use branching effectively.
Common exam traps
The trap here is that candidates often confuse GitFlow's structured branching model with being conflict-minimizing, when in fact its long-lived branches increase conflict risk, while the simpler feature branch workflow with frequent integration is more effective for simultaneous edits.
Trap categories for this question
Similar concept trap
Similar to TFVC, does not use branching effectively.
Detailed technical explanation
Under the hood, the feature branch workflow leverages Git's three-way merge algorithm, which compares the common ancestor, the target branch, and the feature branch to identify conflicts. By keeping feature branches short-lived (typically a few hours to a few days), the divergence from the main branch is minimal, reducing the number of conflicting hunks. In contrast, GitFlow's release branches can live for weeks, causing significant divergence and complex conflict resolution, especially when developers rebase or merge across multiple long-lived branches.
Key takeaway
Answer the scenario, not the keyword: identify the specific constraint before choosing the most familiar-sounding option.
Real-world example
A cloud solutions architect for a retail company is evaluating services for a new workload. The correct answer here reflects best practice for the specific scenario described — not a general cloud recommendation. Answer the scenario, not the keyword: identify the specific constraint before choosing the most familiar-sounding option. Cloud exam questions reward reading the constraint carefully: the same technology can be right or wrong depending on the use case.
What to study next
Identify which exam domain this question belongs to, review the core concept, then practise similar questions from the same domain.
Design and implement a source control strategy — study guide chapter
Learn the concepts, then practise the questions
Design and implement a source control strategy practice questions
Targeted practice on this topic area only
All AZ-400 questions
913 questions across all exam domains
Microsoft Azure DevOps Engineer Expert AZ-400 study guide
Full concept coverage aligned to exam objectives
AZ-400 practice test guide
How to use practice tests most effectively before exam day
Related practice questions
Use these pages to review the topic behind this question. This is how one missed question becomes focused revision.
Practise AZ-400 questions linked to Configure processes and communications.
Practise AZ-400 questions linked to Design and implement source control.
Practise AZ-400 questions linked to Design and implement build and release pipelines.
Practise AZ-400 questions linked to Develop a security and compliance plan.
Practise AZ-400 questions linked to Implement an instrumentation strategy.
Practise AZ-400 questions linked to Design and implement a DevOps infrastructure.
Practise AZ-400 questions linked to Design and implement a source control strategy.
Practise AZ-400 questions linked to AZ-400 fundamentals.
Practise AZ-400 questions linked to AZ-400 scenario.
Practise AZ-400 questions linked to AZ-400 troubleshooting.
Practice this exam
Short sessions build daily habit. Longer sessions build exam-day stamina. Try a timed session to simulate real conditions.
FAQ
Design and implement a source control strategy — This question tests Design and implement a source control strategy — Read the scenario before looking for a memorised answer..
The correct answer is: Feature branch workflow — The feature branch workflow is ideal for minimizing merge conflicts when developers work on the same files simultaneously because each developer creates a short-lived branch off the main branch for their specific feature or fix, commits frequently, and merges back via pull requests. This isolates changes until they are ready, reducing the surface area for conflicts compared to long-lived branches. Git's merge or rebase strategies within this workflow allow for incremental conflict resolution, which is more manageable than resolving large conflicts from divergent histories.
Identify which exam domain this question belongs to, review the core concept, then practise similar questions from the same domain.
Yes — watch for: "minimum / minimize". Asks for the least resource use — fewest addresses, smallest subnet, lowest overhead. Eliminate over-provisioned options even if they would technically work.
Read the scenario before looking for a memorised answer.
About these practice questions
Courseiva creates original exam-style practice questions with explanations and wrong-answer analysis. It does not publish real exam questions, exam dumps, or protected exam content. Learn why practice questions differ from exam dumps →
Last reviewed: Jun 25, 2026
This AZ-400 practice question is part of Courseiva's free Microsoft certification practice question bank. Courseiva provides original exam-style practice questions with explanations, topic-based practice, mock exams, readiness tracking, and study analytics to help learners prepare for the AZ-400 exam.
Question Discussion
Share a tip, memory trick, or ask about the reasoning behind this question. Do not post real exam questions, leaked content, braindumps, or copyrighted exam material. Comments are moderated and may be removed without notice.
Sign in to join the discussion.