Fixed some issues with pulling.

Set default merge strategy to theirs.
Made it so rebase does nothing if you try to rebase from the common ancestor.