Git 冲突：Your local changes would be overwritten by merge. Commit, stash or revert them to proceed？

输入命令：git status 

删除红色冲突部分