結果 : git undo pull after conflict