title: git pull --rebase resolve conflicts by keeping local changes
body: <p>I rebased to master on my local branch. Meanwhile someone did changes on this branch on remote. I am doing <code>git pull --rebase</code>. I don't understand how git interprets this command when it comes to the naming of <code>current</code> and <code>incoming</code>, as well as <code>ours</code> and <code>theirs</code>.</p>
  <p>Which should I choose to always keep my local changes? Also, after my first rebase with master, there are dozens of conflicts. Is there a command to make <code>git pull --rebase</code> just keep all my local changes, instead of having to do it manually? I know about <code>ours</code> and <code>theirs</code>, but I don't know how to incorporate those keywords in <code>git pull --rebase</code> command.</p>
  <p>This stuff is confusing as hell, since all those keywords get reversed between merge and rebase, and then there is pull with rebase to add extra confusion.</p>