使用git desktop我提交了更改并按下了同步。 发生合并错误，我的本地文件发生了很大变化。 如何撤消更改？

Question

当我不应该同步并更改许多本地文件时，我不小心进行了同步，如何撤消此同步？

Answer 1

The following answer assumes that a) you committed all your valuable work already, and b) you don't want anything which came in from the recent merge ("sync"), from the remote branch. Assuming both of these are true, you can just do a hard reset to the current HEAD of your branch:

git reset --hard HEAD

In case you ever end up in a similar situation where you don't want to nuke your entire working directory (and maybe stage as well, if you've staged anything), you can use the following command to checkout an individual file from the HEAD:

git checkout -- path/to/some/file.ext