Add failing test_push_after_merge

related test_push_after_rebase() passes