ours and theirs

Also written: ours, theirs, --ours, --theirs

The two sides of a conflict. In a merge, ours is your branch; in a rebase they swap, so ours is the branch you build on and theirs is your own replayed commit.