Contents

那时候我还不知道.gitignore,也不会用git reset >.<


首先binary files一般是IDE什么的编译生成的,一般是不需要git add进来的!

不过既然已经进来了,这次pull又报

warning: Cannot merge binary files: XXXXXX.xxx <HEAD vs. f21342d65b5b8b07a2d62dd9d7c5ae77a7f52c31>
Auto-merging XXXXXXX.xxx
CONFLICT <content>: Merge conflict in XXXXXXX.xxx
Automatic merge failed; fix conflicts and then commit the result.

这时候要怎么办呢?看这里的Stackoverflow

Contents
comments powered by Disqus