您即将离开知乎，请注意您的账号和财产安全。
https://stackoverflow.com/questions/46275070/why-do-i-get-conflicts-when-i-do-git-revert
