When git merge in Cocos Creator have some erorr and project is crash

When git merge in Cocos Creator have some erorr and project is crash. Has anyone experienced such a problem? How to work with git? How to work with git when the joint development?

Can you show us?