Developing Applications and Automating Workflows Using Cisco Platforms (DEVASC) — Question 406

When changes are made to the same file across two branches, which git status is shown when the branches are combined?

Answer options

• A. unmerged
• B. uncommitted
• C. conflict
• D. branched

Correct answer: A

Explanation

The correct answer is A, 'unmerged', as it indicates that there are changes in both branches that need to be resolved before the merge can be completed. Option B, 'uncommitted', refers to changes that have not been saved to the repository, while option C, 'conflict', describes the situation that arises from an unmerged status but is not the status itself. Option D, 'branched', is not relevant to the merging process.