Your local changes to the following files would be overwritten by merge: .DS_Store

GIT 代码管理时，在合并分支代码过程中，报如下错误信息，导致代码无法合并。

Your local changes to the following files would be overwritten by merge: .DS_Store bonc-base-common/.DS_Store bonc-base-common/src/.DS_Store bonc-base-common/src/main/.DS_Store bonc-base-common/src/main/java/.DS_Store bonc-base-common/src/main/java/com/.DS_Store bonc-module-system/.DS_Store bonc-module-system/src/.DS_Store bonc-module-system/src/main/.DS_Store bonc-module-system/src/main/resources/.DS_Store db/.DS_Store

解决方法如下：

git restore --staged bonc-base-common/.DS_Store
git restore --staged bonc-base-common/src/.DS_Store
git restore --staged bonc-base-common/src/main/.DS_Store
git restore --staged bonc-base-common/src/main/java/.DS_Store
git restore --staged bonc-base-common/src/main/java/com/.DS_Store
git restore --staged bonc-module-system/.DS_Store
git restore --staged bonc-module-system/src/.DS_Store
git restore --staged bonc-module-system/src/main/.DS_Store
git restore --staged bonc-module-system/src/main/resources/.DS_Store
git restore --staged db/.DS_Store

posted @ 2022-07-09 14:42  孟郎郎  阅读(299)  评论(0)  编辑  收藏  举报