Add retry button when checkout failed

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Add "Checkout with merge" when checkout failed

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Merge branch 'checkout-failed'