Ours and theirs in git rebase

When resolving a conflict while doing a git rebase, `--ours` does **not** refer to the branch we are currently on (the one being rebased) but the base branch, e.g. `main`.  

While arguably being pretty confusing, this actually [has a good reason](https://git-scm.com/docs/git-checkout/2.27.0#Documentation/git-checkout.txt---theirs).

A nice cheat sheet is [here](https://nitaym.github.io/ourstheirs/).

alexanderpresber
January 21, 2023