Brew

I was having issues with brew on osx, when I would try

brew update

I was getting a long list that ended with:

Please move or remove them before you can merge. Aborting Error: Failure while executing: git pull -q origin refs/heads/master:refs/remotes/origin/master

To resolve it, I did: $ cd $(brew --prefix) $ rm Library/Formula/argp-standalone.rb $ rm Library/Formula/cocot.rb $ git fetch origin remote: Counting objects: 306, done. remote: Compressing objects: 100% (150/150), done. remote: Total 301 (delta 116), reused 298 (delta 113) Receiving objects: 100% (301/301), 109.15 KiB, done. Resolving deltas: 100% (116/116), done. From https://github.com/mxcl/homebrew * [new branch]     gh-pages   -> origin/gh-pages * [new branch]     go         -> origin/go $ sudo git reset --hard origin/master Password: HEAD is now at bf807ec etcd 0.2.0 Now you should be good to go again!

$ brew update Already up-to-date.

Now's a good time to see what else you can do to optimize brew:

$ brew doctor