Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
代码冲突,如果提交,就会将本地代码覆盖掉,所以需要先将本地代码备份,然后更新代码,最后合并代码
1.备份本地代码,备份后本地代码自动隐藏,代码自动回归到上一个版本
2.更新代码
3.合并备份的代码和更新后的代码
git提交代码出现Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
最新推荐文章于 2024-05-24 10:14:40 发布