Mac에서 Homebrew로 패키지를 관리하다 업데이트를 하니 아래와 같은 에러가 났습니다. -_-;;
$ brew update
From http://github.com/mxcl/homebrew
* branch master -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
Library/Formula/argp-standalone.rb
Library/Formula/aria2.rb
Library/Formula/aspell.rb
Library/Formula/audiofile.rb
Library/Formula/bdw-gc.rb
Library/Formula/boost.rb
Library/Formula/cdargs.rb
Library/Formula/cdparanoia.rb
Library/Formula/cdrdao.rb
Library/Formula/celt.rb
Library/Formula/clisp.rb
Library/Formula/ctags.rb
Library/Formula/d-bus.rb
Library/Formula/dbus-glib.rb
Library/Formula/dialog.rb
Library/Formula/dirac.rb
Library/Formula/dotless.rb
Library/Formula/elinks.rb
Library/Formula/emacs.rb
Library/Formula/erlang.rb
Library/Formula/flac.rb
Library/Formula/flusspferd.rb
Library/Formula/fontforge.rb
Library/Formula/frink.rb
Library/Formula/gambit-scheme.rb
Library/Formula/gawk.rb
Library/Formula/gd.rb
Library/Formula/glib.rb
Library/Formula/gmp.rb
Library/Formula/gnutls.rb
Library/Formula/google-app-engine.rb
Library/Formula/google-perftools.rb
Library/Formula/gpgme.rb
Library/Formula/graphicsmagick.rb
Library/Formula/gtk+.rb
Library/Formula/guile.rb
Library/Formula/hydra.rb
Library/Formula/id3lib.rb
Library/Formula/igraph.rb
Library/Formula/intltool.rb
Library/Formula/jasper.rb
Library/Formula/jnethack.rb
Library/Formula/john.rb
Library/Formula/libao.rb
Library/Formula/libevent.rb
Library/Formula/libexif.rb
Library/Formula/libsigsegv.rb
Library/Formula/libspatialite.rb
Library/Formula/libvirt.rb
Library/Formula/libvpx.rb
Library/Formula/libxml2.rb
Library/Formula/log4cxx.rb
Library/Formula/lua.rb
Library/Formula/monotone.rb
Library/Formula/mosh.rb
Library/Formula/mpd.rb
Library/Formula/mplayer.rb
Library/Formula/mysql-connector-c.rb
Library/Formula/mysql.rb
Library/Formula/nethack.rb
Library/Formula/nmap.rb
Library/Formula/node.rb
Library/Formula/octave.rb
Library/Formula/pango.rb
Library/Formula/parsley.rb
Library/Formula/pbzip2.rb
Library/Formula/pcre.rb
Library/Formula/pdflib-lite.rb
Library/Formula/phpsh.rb
Library/Formula/portaudio.rb
Library/Formula/povray.rb
Library/Formula/proj.rb
Library/Formula/protobuf.rb
Library/Formula/psgrep.rb
Library/Formula/pv.rb
Library/Formula/rabbitmq.rb
Library/Formula/ranger.rb
Library/Formula/rebar.rb
Library/Formula/redis.rb
Library/Formula/redland.rb
Library/Formula/ruby-enterprise-edition.rb
Library/Formula/ruby.rb
Library/Formula/sbcl.rb
Library/Formula/silk.rb
Library/Formula/spatialite-tools.rb
Library/Formula/sphinx.rb
Library/Formula/spin.rb
Library/Formula/streamripper.rb
Library/Formula/swi-prolog.rb
Library/Formula/syck.rb
Library/Formula/tesseract.rb
Library/Formula/ufraw.rb
Library/Formula/unittest.rb
Library/Formula/valgrind.rb
Library/Formula/visualboyadvance.rb
Library/Formula/vpnc.rb
Library/Formula/w3m.rb
Library/Formula/wine.rb
Library/Formula/x264.rb
Library/Formula/xchat.rb
Library/Formula/yaf.rb
Library/Formula/zeromq.rb
Library/Homebrew/compatibility.rb
Library/Homebrew/exceptions.rb
Library/Homebrew/extend/pathname.rb
Library/Homebrew/formula.rb
Library/Homebrew/test/test_versions.rb
Please, commit your changes or stash them before you can merge.
Updating cb377cb..4eb8e9b
Aborting
Error: Failed while executing git pull http://github.com/mxcl/homebrew.git master
$
해결방법은 아래와 같이 하면 됩니다.
$ git reset --hard master
HEAD is now at cb377cb Update polipo to 1.0.4.1.
Dae-Hyun-Sung-ui-MacBook-Pro:local studioego$ brew update
From http://github.com/mxcl/homebrew
* branch master -> FETCH_HEAD
Updated Homebrew from cb377cbb to 4eb8e9b4.
==> The following formulae are new:
gdk-pixbuf tcpstat
==> The following formulae were updated:
argp-standalone gd* lua* redis
aria2 glib* monotone redland
aspell* gmp* mosh ruby*
audiofile gnutls* mpd ruby-enterprise-edition
bdw-gc google-app-engine mplayer* sbcl
boost google-perftools mysql silk
cdargs gpgme mysql-connector-c* spatialite-tools
cdparanoia* graphicsmagick* nethack sphinx
cdrdao gtk+* nmap spin
celt guile node streamripper
clisp hydra octave swi-prolog*
ctags* id3lib pango* syck
d-bus* igraph parsley tesseract
dbus-glib intltool* pbzip2 ufraw
dialog jasper* pcre* unittest
dirac* jnethack pdflib-lite valgrind*
dotless john phpsh visualboyadvance
elinks libao portaudio vpnc
emacs libevent* povray w3m
erlang libexif* proj* wine
flac* libsigsegv protobuf x264*
flusspferd libspatialite psgrep xchat
fontforge libvirt pv yaf
frink libvpx* rabbitmq zeromq
gambit-scheme libxml2* ranger
gawk* log4cxx rebar
No external commands were updated.
$
Buy me a coffee
