git未跟踪文件通过合并覆盖错误的解决方法
在开发标注平台系统的时候,项目原同事将dubbo的注册缓存通过配置项
经过这么已改造,保存项目并提交到 git 仓库,其他同事拉取项目之后,提交时出现如下错误:
error: The following untracked working tree files would be overwritten by merge:
~/.dubbo-registry/data-web-registry.properties
~/.dubbo-registry/data-web-registry.properties.lock
Please move or remove them before you merge.
Aborting