ours and theirs

During a merge, ours is the branch you are on and theirs is the branch being merged in.

In more detail

git checkout --ours file (or git restore --ours) takes your side of a conflicted file entirely, and --theirs takes the other side. In a rebase the roles swap, because you are replaying your commits onto the other branch.

Example

git checkout --ours shopping.txt

Related terms

Taught in

References