about git-merge "Binary files differ"

来源：互联网发布：amd是什么软件编辑：程序博客网时间：2024/05/23 21:22

=>run "git merge master"

than:

warning: Cannot merge binary files: 1 (HEAD vs. master)
Auto-merging 1.c
CONFLICT (content): Merge conflict in 1.c
Auto-merging 1
CONFLICT (content): Merge conflict in 1
Automatic merge failed; fix conflicts and then commit the result.

=>run "git diff"

than:

diff --cc 1
index 6d0cda6,d34cdef..0000000
Binary files differ
diff --cc 1.c
index 18b4f17,7a293d3..0000000
--- a/1.c
+++ b/1.c
@@@ -2,8 -2,7 +2,12 @@@
#include<stdlib.h>
int main(int argc, char** argv)
{
++<<<<<<< HEAD
+ printf("tom:\n");
+ printf("jane:\n");
++=======
+ printf("Alice:\n");
++>>>>>>> master
if(argc < 2)
{
printf("pls input more than 2 args\n");

=>run "./1 3"

than:

tom:
jane:
hello world
hello world
hello world

====================================

so:

binary file will not insert the differents as text file,

if you want to change it, you should copy another

one and replace. run "git add filename" &

"git commit".

0 0