Today I Learned

Giant Monkeys Learning

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.

A nice cheat sheet is here.