I had to make an alias for rebasing, because I kept doing the opposite:

    git checkout master #check out the branch to apply commits to
    git rebase mybranch #Apply all commits from mybranch

Now I just write

    rebase-current-branch

and it does what I want: fetches origin/master and rebases my working branch on top of it.

But "ours"/"theirs" still keeps tripping me up.

Man do I hate this behavior because it would be really some by just using the branch names rather then "ours" and "theirs"