結果 : git cancel pull with conflicts