関連ワード:  git pull resolve conflicts ours    git cancel pull with conflicts  
結果 : git pull resolve conflicts ours