I finished a
git push to a Bitbucket repository and in the Bitbucket account I found these update were done. But when I do a
git pull in a production CentOS server, I got error below. Does anyone know the reason and how to fix it?
xxxx@VM02 sha-ferrero-kinder_201661]$ sudo git pull [sudo] password for XXXX: Password: **warning: Cannot merge binary files: images/Win/WinDisney.png (HEAD vs. 80e984389135a54b8062497fb5c202efcc89fc57) Auto-merging images/Win/WinDisney.png CONFLICT (add/add): Merge conflict in images/Win/WinDisney.png Automatic merge failed; fix conflicts and then commit the result.**
Detail shown in attachment: