问题描述
在git pull时出现下列提示:
warning: Cannot merge binary files: 2022/2022年计划0424版本.xlsx (HEAD vs. d1160c73360d029f29fc1ebf67b5762e977c2451)
Auto-merging 2022/2022年计划0424版本.xlsx
CONFLICT (content): Merge conflict in 2022/2022年计划0424版本.xlsx
warning: Cannot merge binary files: 2022/工作日志模板.xlsx (HEAD vs. d1160c73360d029f29fc1ebf67b5762e977c2451)
Auto-merging 2022/工作日志模板.xlsx
CONFLICT (content): Merge conflict in 2022/工作日志模板.xlsx
warning: Cannot merge binary files: 2022/要做的事情.xlsx (HEAD vs. d1160c73360d029f29fc1ebf67b5762e977c2451)
Auto-merging 2022/要做的事情.xlsx
CONFLICT (content): Merge conflict in 2022/要做的事情.xlsx
Automatic merge failed; fix conflicts and then commit the result.
表明是出现冲突了
解决方法
可采取此语句,实测有效:
git update-ref -d MERGE_HEAD
结果图: