error: Entry ‘code/fe/output/conf/smarty-conf/crm_common-map.json’ would be overwritten by merge. Cannot merge.
需要执行下面的命令才能修复:
git reset --hard HEAD
git clean -f -d
git pull
error: Entry ‘code/fe/output/conf/smarty-conf/crm_common-map.json’ would be overwritten by merge. Cannot merge.
需要执行下面的命令才能修复:
git reset --hard HEAD
git clean -f -d
git pull