関連ワード:  git revert commit merge conflict    git cancel merge with conflicts  
結果 : git revert commit merge conflict