Naonao Blog

Welcome to Naonao Blog

0%

Git Your local changes to the following files would be overwritten by merge

发表于 分类于 阅读次数： Valine：

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

错误描述

1
2
3
4
5
6
e66515c..389e67f  master     -> gitlab/master
error: Your local changes to the following files would be overwritten by merge:
        config/clash/haikou.yaml
        config/clash/yuncheng.yaml
Please commit your changes or stash them before you merge.
Aborting

方法一

放弃本地修改,直接覆盖

1
2
git reset --hard
git pull