In git, during rebase, ours and theirs are reversed. `theirs` is actually the current branch in the case of rebase.