git中二进制文件冲突了怎么办

Question

比如psd，图片什么的

Answer 1

For binary file conflicts, you definitely don’t want to resolve the conflict by editing the binary file, that is impossible.
All you have to do is: either choose the other party's modifications, or choose your own modifications.
You can use the --theirs或--ours option of git checkout.

git pull
git checkout --theirs YOUR_BINARY_FILE
// git checkout --ours YOUR_BINARY_FILE
git add YOUR_BINARY_FILE
git commit -m 'merged with the remote repos.'
git push

Answer 2

Cut conflicting files to the desktop, pull, cut back from the desktop, commit, push

Answer 3

Plus -fMandatory coverage.