idea git提交项目,忽略文件或文件夹设置:https://blog.csdn.net/weixin_42617398/article/details/81807448
Your local changes would be overwritten by merge. Commit, stash or revert them to proceed:https://blog.csdn.net/a872822645/article/details/80669737
来源:oschina
链接:https://my.oschina.net/qimhkaiyuan/blog/4913268