結果 : git undo pull with conflicts