git merge & rebase invert meaning of ours & theirs