Always rebase when pulling.