Git · Senior · Question 33 of 76
During git rebase main, what do "ours" and "theirs" refer to?
- 1Both refer to the remote version of the same branch
- ✓Correct answer: Ours is
main, the new base; theirs is your commit - 3Ours is your branch; theirs is
main, as in a merge
Explanation
Rebase checks out the base and applies your commits onto it, so from Git's point of view your commits are "theirs". It's a classic source of wrong conflict resolutions.