git pull 时遇到 cannot merge binary files问题解决办法 执行git pull 之后提示:Cannot merge binary files: Path/filename 解决方法: git checkout --theirs Path/filename git add Path/filename git commit -m “提交信息”