Ours vs theirs in conflicts in Git - Quick Revision & Key Differences

Recall & Review

beginner

What does 'ours' mean in a Git conflict?

'Ours' refers to the version of the file from the current branch you are on when a conflict happens.

beginner

What does 'theirs' mean in a Git conflict?

'Theirs' means the version of the file from the branch you are trying to merge into your current branch.

intermediate

How do you choose 'ours' version to resolve a conflict using Git command line?

You can run: git checkout --ours <file> to keep your current branch's version of the file.

intermediate

How do you choose 'theirs' version to resolve a conflict using Git command line?

You can run: git checkout --theirs <file> to keep the incoming branch's version of the file.

beginner

Why is it important to understand 'ours' vs 'theirs' in Git conflicts?

Because it helps you decide which changes to keep when two versions of a file clash, avoiding mistakes and lost work.

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

A The current branch's version

B The incoming branch's version

C A backup copy

D The remote repository

'Ours' means the version from the branch you currently have checked out.

Which command keeps the 'theirs' version of a file during conflict resolution?

A git checkout --theirs <file>

B git reset <file>

C git checkout --ours <file>

D git merge --abort

The command 'git checkout --theirs ' selects the incoming branch's version.

If you want to keep your current branch's changes during a conflict, which option do you use?

A none

B theirs

C both

D ours

'Ours' means keeping your current branch's changes.

What happens if you do not resolve a Git conflict?

A Git automatically chooses 'theirs'

B You cannot complete the merge

C Git automatically chooses 'ours'

D Git deletes the conflicting files

You must resolve conflicts before completing a merge.

Which of these is NOT a way to resolve conflicts in Git?

A Manually editing the file

B Using git checkout --theirs

C Running git push --force

D Using git checkout --ours

'git push --force' does not resolve conflicts; it forces pushing changes.

Explain the difference between 'ours' and 'theirs' in Git conflicts.

Think about which branch you are on and which branch you are merging.

Describe how to resolve a conflict by choosing the 'theirs' version using Git commands.

Remember the steps to tell Git which version to keep and mark conflict resolved.