git: rebase with and without conflict