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
0.0 0

#1

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?


#2

Can you show us?