And, on the command-line at least, "theirs" and "ours" are reversed (only) for "rebase" [1] so that means, at least for me, I have to mentally ask myself "are t

And, on the command-line at least, "theirs" and "ours" are reversed (only) for "rebase" [1] so that means, at least for me, I have to mentally ask myself "are theirs/ours reversed for this command?" for every command I execute, they might as well be called "foo" and "bar" at this point for me. [1] https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---merge https://git-scm.com/docs/git-rebase#Documentation/git-rebase...