自宅のiMacで久々にHomebrewをUpdateしたら、下記のエラー。
$ brew update
error: The following untracked working tree files would be overwritten by merge:
Library/Aliases/twolame
Library/Contributions/cmds/brew-test-bot/brew-test-bot.commit.html.erb
Library/Contributions/cmds/brew-test-bot/brew-test-bot.css
Library/Contributions/cmds/brew-test-bot/brew-test-bot.index.html.erb
Library/Formula/aiccu.rb
Library/Formula/aws-cloudsearch.rb
Library/Formula/aws-sns-cli.rb
Library/Formula/byacc.rb
Library/Formula/cadubi.rb
Library/Formula/cdpr.rb
Library/Formula/cogl.rb
Library/Formula/cutter.rb
Library/Formula/debianutils.rb
Library/Formula/dynamips.rb
Library/Formula/fakeroot.rb
Library/Formula/flickcurl.rb
Library/Formula/freeswitch.rb
Library/Formula/genstats.rb
Library/Formula/gpsd.rb
Library/Formula/gtk+3.rb
Library/Formula/gzrt.rb
Library/Formula/https_load.rb
Library/Formula/hwloc.rb
Library/Formula/hyperestraier.rb
Library/Formula/ideviceinstaller.rb
Library/Formula/jasmin.rb
Library/Formula/jpeg-turbo.rb
Library/Formula/libspiro.rb
Library/Formula/libstfl.rb
Library/Formula/logentries.rb
Library/Formula/mame.rb
Library/Formula/md.rb
Library/Formula/mess.rb
Library/Formula/mysql-cluster.rb
Library/Formula/mysql-connector-odbc.rb
Library/Formula/ophcrack.rb
Library/Formula/opus-tools.rb
Library/Formula/opus.rb
Library/Formula/pam_yubico.rb
Library/Formula/pathfinder.rb
Library/Formula/qstat.rb
Library/Formula/qxmpp.rb
Library/Formula/rbenv-vars.rb
Library/Formula/ren.rb
Library/Formula/rom-tools.rb
Library/Formula/rtpbreak.rb
Library/Formula/txt2man.rb
Library/Formula/valkyrie.rb
Library/Formula/verilator.rb
Library/Formula/visualnetkit.rb
Library/Formula/voldemort.rb
Library/Formula/wemux.rb
Library/Formula/yydecode.rb
Library/Formula/zsh-completions.rb
Library/Homebrew/checksums.rb
Library/Homebrew/macos.rb
Library/Homebrew/macos/xcode.rb
Library/Homebrew/macos/xquartz.rb
Library/Homebrew/pkgconfig/libcurl.pc
Library/Homebrew/pkgconfig/libexslt.pc
Library/Homebrew/pkgconfig/libxml-2.0.pc
Library/Homebrew/pkgconfig/libxslt.pc
Library/Homebrew/test/test_bottles.rb
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
下記のコマンドで復活した。
$ git reset --hard origin/master HEAD is now at 8bb77e6 cmake: 2.8.9 $ brew update Already up-to-date.