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

作者：煮酒与君饮 | 2024-06-28 00:54:00

踩

your local changes to the following files would be overwritten by merge: .ds

1.git 提交合并分支代码提示：

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

2.解决办法：

根据提示错误信息，执行以下命令：

git restore --staged plugin_manager/.DS_Store
git restore --staged plugin_manager/src/.DS_Store
git restore --staged plugins/.DS_Store
git restore --staged sql/.DS_Store

3.再次推送代码 success。

声明：本文内容由网友自发贡献，不代表【wpsshop博客】立场，版权归原作者所有，本站不承担相应法律责任。如您发现有侵权的内容，请联系我们。转载请注明出处：https://www.wpsshop.cn/w/煮酒与君饮/article/detail/764415