gistfile1.txt

allen-tan:usr 204854$ brew update
error: Your local changes to the following files would be overwritten by merge:
	Library/Contributions/brew_bash_completion.sh
	Library/Contributions/brew_fish_completion.fish
	Library/Contributions/brew_zsh_completion.zsh
	Library/Contributions/cmd/brew-graph
	Library/Contributions/cmd/brew-man
	Library/Contributions/cmd/brew-pull.rb
	Library/Contributions/cmd/brew-readall.rb
	Library/Contributions/cmd/brew-server
	Library/Contributions/cmd/brew-services.rb
	Library/Contributions/cmd/brew-tap-readme.rb
	Library/Contributions/cmd/brew-test-bot.rb
	Library/Contributions/cmd/brew-which.rb
	Library/Contributions/manpages/brew.1.md
	Library/ENV/4.3/bsdmake
	Library/ENV/4.3/cc
	Library/ENV/4.3/make
	Library/ENV/4.3/xcrun
	Library/Formula/a2ps.rb
	Library/Formula/aacgain.rb
	Library/Formula/aalib.rb
	Library/Formula/aamath.rb
	Library/Formula/aardvark_shell_utils.rb
	Library/Formula/abcde.rb
	Library/Formula/abcl.rb
	Library/Formula/abcm2ps.rb
	Library/Formula/abcmidi.rb
	Library/Formula/abook.rb
	Library/Formula/ace.rb
	Library/Formula/ack.rb
	Library/Formula/acpica.rb
	Library/Formula/activemq.rb
	Library/Formula/adobe-air-sdk.rb
	Library/Formula/adplug.rb
	Library/Formula/advancecomp.rb
	Library/Formula/afflib.rb
	Library/Formula/aften.rb
	Library/Formula/afuse.rb
	Library/Formula/aget.rb
	Library/Formula/aggregate.rb
	Library/Formula/aiccu.rb
	Library/Formula/aircrack-ng.rb
	Library/Formula/akka.rb
	Library/Formula/aldo.rb
	Library/Formula/algol68g.rb
	Library/Formula/alpine.rb
	Library/Formula/alure.rb
	Library/Formula/android-ndk.rb
	Library/Formula/android-sdk.rb
	Library/Formula/ansifilter.rb
	Library/Formula/antlr.rb
	Library/Formula/anttweakbar.rb
	Library/Formula/aoeui.rb
	Library/Formula/apachetop.rb
	Library/Formula/ape.rb
	Library/Formula/apktool.rb
	Library/Formula/aplus.rb
	Library/Formula/apollo.rb
	Library/Formula/app-engine-java-sdk.rb
	Library/Formula/apt-cacher-ng.rb
	Library/Formula/apt-dater.rb
	Library/Formula/aqbanking.rb
	Library/Formula/arabica.rb
	Library/Formula/arangodb.rb
	Library/Formula/argp-standalone.rb
	Library/Formula/argtable.rb
	Library/Formula/aria2.rb
	Library/Formula/arp-scan.rb
	Library/Formula/arp-sk.rb
	Library/Formula/arss.rb
	Library/Formula/ascii.rb
	Library/Formula/asciidoc.rb
	Library/Formula/asciitex.rb
	Library/Formula/asm6.rb
	Library/Formula/asn1c.rb
	Library/Formula/aspell.rb
	Library/Formula/assimp.rb
	Library/Formula/astyle.rb
	Library/Formula/at-spi2-atk.rb
	Library/Formula/at-spi2-core.rb
	Library/Formula/atari++.rb
	Library/Formula/atf.rb
	Library/Formula/atk.rb
	Library/Formula/atkmm.rb
	Library/Formula/atomicparsley.rb
	Library/Formula/aubio.rb
	Library/Formula/auctex.rb
	Library/Formula/augeas.rb
	Library/Formula/authexec.rb
	Library/Formula/auto-scaling.rb
	Library/Formula/autoconf-archive.rb
	Library/Formula/autoconf.rb
	Library/Formula/autogen.rb
	Library/Formula/autojump.rb
	Library/Formula/automake.rb
	Library/Formula/automoc4.rb
	Library/Formula/automysqlbackup.rb
	Library/Formula/autopano-sift-c.rb
	Library/Formula/autopsy.rb
	Library/Formula/autossh.rb
	Library/Formula/autotrace.rb
	Library/Formula/avian.rb
	Library/Formula/avidemux.rb
	Library/Formula/aview.rb
	Library/Formula/avra.rb
	Library/Formula/avrdude.rb
	Library/Formula/avro-c.rb
	Library/Formula/avro-cpp.rb
	Library/Formula/aws-elasticache.rb
	Library/Formula/aws-elasticbeanstalk.rb
	Library/Formula/aws-sns-cli.rb
	Library/Formula/axel.rb
	Library/Formula/babl.rb
	Library/Formula/backupninja.rb
	Library/Formula/bagit.rb
	Library/Formula/balance.rb
	Library/Formula/base64.rb
	Library/Formula/basex.rb
	Library/Formula/bash-completion.rb
	Library/Formula/bash.rb
	Library/Formula/bashdb.rb
	Library/Formula/bashish.rb
	Library/Formula/bats.rb
	Library/Formula/bazaar.rb
	Library/Formula/bbcp.rb
	Library/Formula/bdw-gc.rb
	Library/Formula/beansdb.rb
	Library/Formula/beanstalk.rb
	Library/Formula/beecrypt.rb
	Library/Formula/berkeley-db.rb
	Library/Formula/berkeley-db4.rb
	Library/Formula/bgrep.rb
	Library/Formula/bib-tool.rb
	Library/Formula/bibutils.rb
	Library/Formula/bigloo.rb
	Library/Formula/bind.rb
	Lib
error: The following untracked working tree files would be overwritten by merge:
	Library/Aliases/csvfix
	Library/Aliases/git-tig
	Library/Aliases/libtcnative
	Library/Aliases/twemproxy
	Library/Aliases/vid.stab
	Library/Contributions/cmd/brew-aspell-dictionaries.rb
	Library/Contributions/cmd/brew-bundle-dir.rb
	Library/Contributions/cmd/brew-bundle.rb
	Library/Contributions/cmd/brew-gist-logs.rb
	Library/Contributions/example-formula.rb
	Library/ENV/4.3/ant
	Library/ENV/4.3/g++-4.3
	Library/ENV/4.3/g++-4.4
	Library/ENV/4.3/g++-4.5
	Library/ENV/4.3/g++-4.6
	Library/ENV/4.3/g++-4.7
	Library/ENV/4.3/g++-4.8
	Library/ENV/4.3/g++-4.9
	Library/ENV/4.3/gcc-4.3
	Library/ENV/4.3/gcc-4.4
	Library/ENV/4.3/gcc-4.5
	Library/ENV/4.3/gcc-4.6
	Library/ENV/4.3/gcc-4.7
	Library/ENV/4.3/gcc-4.8
	Library/ENV/4.3/gcc-4.9
	Library/ENV/4.3/pod2man
	Library/Formula/aces_container.rb
	Library/Formula/acme.rb
	Library/Formula/activemq-cpp.rb
	Library/Formula/afio.rb
	Library/Formula/aha.rb
	Library/Formula/ahcpd.rb
	Library/Formula/align.rb
	Library/Formula/alpine-chappa.rb
	Library/Formula/amtterm.rb
	Library/Formula/analog.rb
	Library/Formula/android-platform-tools.rb
	Library/Formula/ansible.rb
	Library/Formula/ant-contrib.rb
	Library/Formula/ant.rb
	Library/Formula/apache-forrest.rb
	Library/Formula/apache-opennlp.rb
	Library/Formula/apache-spark.rb
	Library/Formula/apib.rb
	Library/Formula/apngasm.rb
	Library/Formula/appscale-tools.rb
	Library/Formula/archey.rb
	Library/Formula/archivemount.rb
	Library/Formula/argus-clients.rb
	Library/Formula/argus.rb
	Library/Formula/aspcud.rb
	Library/Formula/atdtool.rb
	Library/Formula/avfs.rb
	Library/Formula/avro-tools.rb
	Library/Formula/awscli.rb
	Library/Formula/b43-fwcutter.rb
	Library/Formula/babeld.rb
	Library/Formula/bacula-fd.rb
	Library/Formula/batik.rb
	Library/Formula/bbe.rb
	Library/Formula/bear.rb
	Library/Formula/betty.rb
	Library/Formula/bfg.rb
	Library/Formula/bgpq3.rb
	Library/Formula/bigdata.rb
	Library/Formula/bip.rb
	Library/Formula/bitchx.rb
	Library/Formula/bittwist.rb
	Library/Formula/bmake.rb
	Library/Formula/boot2docker.rb
	Library/Formula/brag.rb
	Library/Formula/burl.rb
	Library/Formula/camlistore.rb
	Library/Formula/capnp.rb
	Library/Formula/capstone.rb
	Library/Formula/cask.rb
	Library/Formula/cattle.rb
	Library/Formula/cdimgtools.rb
	Library/Formula/cdlabelgen.rb
	Library/Formula/cfv.rb
	Library/Formula/charm-tools.rb
	Library/Formula/chgems.rb
	Library/Formula/chisel.rb
	Library/Formula/chrome-cli.rb
	Library/Formula/chruby-fish.rb
	Library/Formula/clens.rb
	Library/Formula/clib.rb
	Library/Formula/cliclick.rb
	Library/Formula/clipper.rb
	Library/Formula/clipsafe.rb
	Library/Formula/clockywock.rb
	Library/Formula/cloudfoundry-cli.rb
	Library/Formula/clutter-gst.rb
	Library/Formula/clutter-gtk.rb
	Library/Formula/cmuclmtk.rb
	Library/Formula/compcert.rb
	Library/Formula/compface.rb
	Library/Formula/cookiecutter.rb
	Library/Formula/coremod.rb
	Library/Formula/cppi.rb
	Library/Formula/cputhrottle.rb
	Library/Formula/crunch.rb
	Library/Formula/cspice.rb
	Library/Formula/curaengine.rb
	Library/Formula/cvs.rb
	Library/Formula/cweb.rb
	Library/Formula/darcs.rb
	Library/Formula/darkhttpd.rb
	Library/Formula/dateutils.rb
	Library/Formula/datomic.rb
	Library/Formula/davix.rb
	Library/Formula/ddar.rb
	Library/Formula/deheader.rb
	Library/Formula/dieharder.rb
	Library/Formula/diff-pdf.rb
	Library/Formula/dirt.rb
	Library/Formula/dnsperf.rb
	Library/Formula/docker.rb
	Library/Formula/drake.rb
	Library/Formula/dtc.rb
	Library/Formula/duo_unix.rb
	Library/Formula/dynamodb-local.rb
	Library/Formula/echoprint-codegen.rb
	Library/Formula/ejdb.rb
	Library/Formula/ekhtml.rb
	Library/Formula/electric-fence.rb
	Library/Formula/entr.rb
	Library/Formula/es.rb
	Library/Formula/etcd.rb
	Library/Formula/etcdctl.rb
	Library/Formula/euca2ools.rb
	Library/Formula/evas.rb
	Library/Formula/ex-vi.rb
	Library/Formula/fdclone.rb
	Library/Formula/flac123.rb
	Library/Formula/flashrom.rb
	Library/Formula/flawfinder.rb
	Library/Formula/fleetctl.rb
	Library/Formula/flowgrind.rb
	Library/Formula/flvmeta.rb
	Library/F
Aborting
Error: Failure while executing: git pull -q origin refs/heads/master:refs/remotes/origin/master
allen-tan:usr 204854$