git - 如何忽略有关本地更改的“ git pull”错误，因为合并会覆盖我的本地更改？(How do I ignore an error on 'git pull' about my local changes would be overwritten by merge?)

Question

How do I ignore the following error message on Git pull?

(如何忽略有关Git pull的以下错误消息？)

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

(您对以下文件的本地更改将被合并覆盖)

What if I want to overwrite them?

(如果我想覆盖它们怎么办？)

I've tried things like git pull -f , but nothing works.

(我已经尝试过git pull -f类的东西，但是没有任何效果。)

To be clear, I only want to overwrite specific changes, not everything.

(需要明确的是，我只想覆盖特定的更改，而不是所有内容。)

  ask by mae translate from so

Answer 1

If you want remove all local changes from your working copy, simply stash them:

(如果要从工作副本中删除所有本地更改，只需将它们存储起来：)

git stash save --keep-index

If you don't need them anymore, you now can drop that stash:

(如果您不再需要它们，现在可以删除该存储：)

git stash drop

---

If you want to overwrite only specific parts of your local changes, there are two possibilities:

(如果只想覆盖本地更改的特定部分，则有两种可能性：)

1. Commit everything you don't want to overwrite and use the method above for the rest.

   (提交所有您不想覆盖的内容，其余使用上面的方法。)

2. Use git checkout path/to/file/to/revert for the changes you wish to overwrite.

   (使用git checkout path/to/file/to/revert来覆盖您想要覆盖的更改。)

   Make sure that file is not staged via git reset HEAD path/to/file/to/revert .

   (确保未通过git reset HEAD path/to/file/to/revert 。)