Note that during git rebase and git pull --rebase, ours and theirs may appear swapped; --ours gives the version from the branch the changes are rebased onto, while –theirs gives the version from the branch that holds your work that is being rebased.

git is so stupid sometimes