自制软件更新恼人的错误消息

Question

当我做 ...

brew update

我一直收到此错误消息...

From https://github.com/mxcl/homebrew
25c0495..af1d9f1  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge: 
       Library/Formula/postgresql.rb
Please, commit your changes or stash them before you can merge.

我想找到该文件,并查看最新版本,但我甚至找不到文件夹'Formula'.嗯..所以我卸载postgresql并再次尝试'brew update'但遇到同样的错误.

感谢是否有人可以帮助我？

Answer 1

cd `brew --repository`
git reset --hard HEAD
brew update

有时上述方法无效.在那种情况下,做

cd `brew --repository`
git reset --hard origin/master
brew update