1.Committing is not possible because you have unmerged files.
Committing is not possible because you have unmerged files. 由于您没有合并的文件,因此无法提交。
解决方法
用git diff或者git status 查看哪些文件冲突,有冲突的会提示:
++<<<<<<< HEAD
++<<<<<<< new_branch
修改你的冲突的文件,然后用git add xxx,把你修改的文件全部都添加进去。之后就是正常的提交流程
2.删除已提交文件
D:\IDEAWorkspace\fy8>git rm -r fund-api/target/classes
rm 'fund-api/target/classes/application-dev.yml'
rm 'fund-api/target/classes/application-dev.yml'
rm 'fund-api/target/classes/application.yml'
rm 'fund-api/target/classes/application.yml'
rm 'fund-api/target/classes/com/fy8/fund/api/handler/GlobalDefaultExceptionHandler.class'
rm 'fund-api/target/classes/com/fy8/fund/api/handler/GlobalDefaultExceptionHandler.class'
rm 'fund-api/target/classes/com/fy8/fund/api/handler/ResponsePayload.class'
rm 'fund-api/target/classes/com/fy8/fund/api/handler/ResponsePayload.class'