pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches