[Solved] After a merge conflict on config.yaml, you run:git checkout --theirs config.yamlWhat will be the content of config.yaml? | Git

Git - Cherry-Pick and Advanced Merging

After a merge conflict on config.yaml, you run:
git checkout --theirs config.yaml
What will be the content of config.yaml?

AThe version from your current branch

BThe version from the branch you are merging from

CAn empty file

DThe common ancestor version

Step-by-Step Solution

Solution:

Step 1: Understand the command effect
'git checkout --theirs ' replaces the conflicted file with the incoming branch's version.
Step 2: Identify which version is 'theirs'
'Theirs' means the branch you are merging from, so the file content will be from that branch.
Final Answer:
The version from the branch you are merging from -> Option B
Quick Check:
Checkout --theirs = incoming branch content [OK]

Quick Trick: Checkout --theirs picks incoming branch file content [OK]

Common Mistakes:

Master "Cherry-Pick and Advanced Merging" in Git

9 interactive learning modes - each teaches the same concept differently

More Git Quizzes

After a merge conflict on config.yaml, you run: