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

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

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

执行命令：

 git restore --staged  报错路径/.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。