Add a test for rebase when a change was picked upstream