Bird
0
0

In a Git merge conflict, what does ours refer to?

easy📝 Conceptual Q11 of 15
Git - Cherry-Pick and Advanced Merging
In a Git merge conflict, what does ours refer to?
AA backup copy of the file before the merge
BThe version of the file in the branch you are merging
CThe common ancestor version of the file
DThe version of the file in your current branch
Step-by-Step Solution
Solution:

  1. Step 1: Understand the meaning of 'ours' in Git conflicts

    'Ours' means the version of the file in your current branch where you started the merge.

  2. Step 2: Differentiate from 'theirs'

    'Theirs' refers to the version from the branch you are merging into your current branch.

  3. Final Answer:

    The version of the file in your current branch -> Option D

  4. Quick Check:

    Ours = current branch version [OK]
Quick Trick: Ours = your branch, theirs = merging branch [OK]
Common Mistakes:
  • Confusing 'ours' with 'theirs'
  • Thinking 'ours' means the common ancestor
  • Assuming 'ours' is a backup copy

Want More Practice?

15+ quiz questions · All difficulty levels · Free

Free Signup - Practice All Questions
More Git Quizzes
Cherry-Pick and Advanced Merging - git cherry-pick a single commit - Quiz 4medium Collaboration Workflows - Fork and pull request workflow - Quiz 7medium Collaboration Workflows - Why workflow agreement matters - Quiz 13medium Rebasing - Golden rule of rebasing (never rebase public) - Quiz 10hard Rebasing - Rebase vs merge mental model - Quiz 12easy Remote Repositories - git pull to download and merge - Quiz 12easy Remote Repositories - Fetch vs pull difference - Quiz 7medium Stashing - Dropping and clearing stashes - Quiz 3easy Stashing - Dropping and clearing stashes - Quiz 5medium Stashing - git stash to save changes - Quiz 11easy