Git · Senior · Question 32 of 76
How do you get exactly "their" version of a conflicted file during a merge?
- ✓Correct answer:
git checkout --theirs file - 2
git reset --theirs file - 3
git merge --theirs file
Explanation
--ours/--theirs pick a side from the index stages; then git add the file. Beware: during a rebase "ours" is the branch you're rebasing onto, so the meanings swap.