Attempt to resolve merge conflicts before rebase