Rebase on failed pull and restore on rebase conflict policy