Use a rebase pull and verify that's OK