今天推送代码的时候遇到了一个问题
error: The following untracked working tree files would be overwritten by merge:
xxxx-xxxx-core/xxx-xxxx-core.iml
Please move or remove them before you merge.
Abortingerror: The following unerror: The following untracked working tree files would be overwritten by merge:
xxxx-xxxx-core/xxx-xxxx-core.iml
Please move or remove them before you merge.
Abortingerror: The following un