search

platanus / our-boxen

MIT License
6 stars 1 forks source link

Failed for jaime #141

Closed bunzli closed 10 years ago

bunzli commented 10 years ago

Running on jimbos-mac.platan.us (OS X 10.9.4) under /bin/bash, version 8d2c1ee30041acbd297cca5f77162990166e07e2 (compare to master).

Puppet Command

/opt/boxen/repo/bin/puppet apply --group admin --confdir /tmp/boxen/puppet/conf --vardir /tmp/boxen/puppet/var --libdir /opt/boxen/repo/lib --libdir /opt/boxen/repo/.bundle/ruby/2.0.0/gems/boxen-2.6.0/lib --manifestdir /opt/boxen/repo/manifests --modulepath /opt/boxen/repo/modules:/opt/boxen/repo/shared --hiera_config /opt/boxen/repo/config/hiera.yaml --logdest /opt/boxen/repo/log/boxen.log --logdest console --no-report --detailed-exitcodes --show_diff /opt/boxen/repo/manifests/site.pp

Output (from /opt/boxen/repo/log/boxen.log)

2014-08-20 17:22:56 -0400 Puppet (warning): Setting manifestdir is deprecated. See http://links.puppetlabs.com/env-settings-deprecations
   (at /opt/boxen/repo/.bundle/ruby/2.0.0/gems/puppet-3.6.1/lib/puppet/settings.rb:260:in `block (2 levels) in parse_global_options')
2014-08-20 17:22:56 -0400 Puppet (err): Unable to set ownership of log file
2014-08-20 17:23:04 -0400 Puppet (notice): Compiled catalog for jimbos-mac.platan.us in environment production in 4.80 seconds
2014-08-20 17:23:08 -0400 /Stage[main]/Boxen::Security/Boxen::Osx_defaults[require password at screensaver]/Exec[osx_defaults write  com.apple.screensaver:askForPassword=>true]/returns (notice): executed successfully
2014-08-20 17:23:51 -0400 /Stage[main]/Platanus::Environment/Nodejs::Module[bower for 0.10]/Npm_module[bower for 0.10]/ensure (notice): ensure changed '1.3.4' to '~1.3'
2014-08-20 17:24:08 -0400 /Stage[main]/Platanus::Environment/Nodejs::Module[grunt-cli for 0.10]/Npm_module[grunt-cli for 0.10]/ensure (notice): ensure changed '0.1.13' to '~0.1'
2014-08-20 17:24:22 -0400 /Stage[main]/Platanus::Environment/Nodejs::Module[gulp for 0.10]/Npm_module[gulp for 0.10]/ensure (notice): ensure changed '3.8.7' to '~3.8'
2014-08-20 17:24:22 -0400 /Stage[main]/Nodejs::Rehash/Exec[nodenv rehash after npm module install] (notice): Triggered 'refresh' from 3 events
2014-08-20 17:24:24 -0400 Package[hub](provider=homebrew) (notice): Updating homebrew formulas
2014-08-20 17:24:37 -0400 Puppet (err): Could not update: Execution of 'brew update' returned 1: error: Your local changes to the following files would be overwritten by merge:
    CONTRIBUTING.md
    Library/Contributions/brew_fish_completion.fish
    Library/Contributions/cmd/brew-aspell-dictionaries.rb
    Library/Contributions/cmd/brew-beer.rb
    Library/Contributions/cmd/brew-bundle-dir.rb
    Library/Contributions/cmd/brew-bundle.rb
    Library/Contributions/cmd/brew-gist-logs.rb
    Library/Contributions/cmd/brew-graph
    Library/Contributions/cmd/brew-pull.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/example-formula.rb
    Library/Contributions/manpages/brew.1.md
    Library/ENV/4.3/cc
    Library/ENV/pkgconfig/10.8/libcurl.pc
    Library/ENV/pkgconfig/10.8/libexslt.pc
    Library/ENV/pkgconfig/10.8/libxml-2.0.pc
    Library/ENV/pkgconfig/10.8/libxslt.pc
    Library/ENV/pkgconfig/10.9
    Library/Formula/aalib.rb
    Library/Formula/aamath.rb
    Library/Formula/aardvark_shell_utils.rb
    Library/Formula/abcm2ps.rb
    Library/Formula/abcmidi.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/advancecomp.rb
    Library/Formula/afflib.rb
    Library/Formula/afio.rb
    Library/Formula/aggregate.rb
    Library/Formula/aha.rb
    Library/Formula/algol68g.rb
    Library/Formula/align.rb
    Library/Formula/alure.rb
    Library/Formula/amtterm.rb
    Library/Formula/analog.rb
    Library/Formula/android-ndk.rb
    Library/Formula/android-sdk.rb
    Library/Formula/ansible.rb
    Library/Formula/ansifilter.rb
    Library/Formula/ant.rb
    Library/Formula/antlr.rb
    Library/Formula/apache-forrest.rb
    Library/Formula/apache-spark.rb
    Library/Formula/apachetop.rb
    Library/Formula/apollo.rb
    Library/Formula/app-engine-java-sdk.rb
    Library/Formula/appscale-tools.rb
    Library/Formula/apt-cacher-ng.rb
    Library/Formula/aqbanking.rb
    Library/Formula/arangodb.rb
    Library/Formula/aria2.rb
    Library/Formula/arp-scan.rb
    Library/Formula/arp-sk.rb
    Library/Formula/arping.rb
    Library/Formula/arpoison.rb
    Library/Formula/ascii.rb
    Library/Formula/assimp.rb
    Library/Formula/aterm.rb
    Library/Formula/aubio.rb
    Library/Formula/auto-scaling.rb
    Library/Formula/autogen.rb
    Library/Formula/autopano-sift-c.rb
    Library/Formula/avian.rb
    Library/Formula/avra.rb
    Library/Formula/avrdude.rb
    Library/Formula/awscli.rb
    Library/Formula/base64.rb
    Library/Formula/basex.rb
    Library/Formula/bash.rb
    Library/Formula/bats.rb
    Library/Formula/bbcp.rb
    Library/Formula/bdw-gc.rb
    Library/Formula/bear.rb
    Library/Formula/beecrypt.rb
    Library/Formula/betty.rb
    Library/Formula/bgrep.rb
    Library/Formula/bind.rb
    Library/Formula/bindfs.rb
    Library/Formula/binutils.rb
    Library/Formula/binwalk.rb
    Library/Formula/bitchx.rb
    Library/Formula/bitlbee.rb
    Library/Formula/bmon.rb
    Library/Formula/boost.rb
    Library/Formula/boot2docker.rb
    Library/Formula/bro.rb
    Library/Formula/bup.rb
    Library/Formula/burp.rb
    Library/Formula/cabal-install.rb
    Library/Formula/calc.rb
    Library/Formula/camlistore.rb
    Library/Formula/cask.rb
    Library/Formula/cassandra.rb
    Library/Formula/cbmbasic.rb
    Library/Formula/ccal.rb
    Library/Formula/ccextractor.rb
    Library/Formula/cctools-headers.rb
    Library/Formula/cdecl.rb
    Library/Formula/cdrtools.rb
    Library/Formula/cfengine.rb
    Library/Formula/cfitsio.rb
    Library/Formula/cgdb.rb
    Library/Formula/cheat.rb
    Library/Formula/check.rb
    Library/Formula/chibi-scheme.rb
    Library/Formula/chicken.rb
    Library/Formula/chisel.rb
    Library/Formula/chkrootkit.rb
    Library/Formula/chmlib.rb
    Library/Formula/cimg.rb
    Library/Formula/cksfv.rb
    Library/Formula/clamav.rb
    Library/Formula/clhep.rb
    Library/Formula/clib.rb
    Library/Formula/clipsafe.rb
    Library/Formula/cln.rb
    Library/Formula/cloc.rb
    Library/Formula/clojurescript.rb
    Library/Formula/cloog.rb
    Library/Formula/closure-compiler.rb
    Library/Formula/clucene.rb
    Library/Formula/cmake.rb
    Library/Formula/cmus.rb
    Library/Formula/concurrencykit.rb
    Library/Formula/cookiecutter.rb
    Library/Formula/coq.rb
    Library/For
error: The following untracked working tree files would be overwritten by merge:
    Library/Aliases/boot2docker-cli
    Library/Aliases/pt
    Library/Contributions/cmd/brew-versions.rb
    Library/ENV/pkgconfig/10.10/libcurl.pc
    Library/ENV/pkgconfig/10.10/libexslt.pc
    Library/ENV/pkgconfig/10.10/libxml-2.0.pc
    Library/ENV/pkgconfig/10.10/libxslt.pc
    Library/Formula/ats2-postiats.rb
    Library/Formula/bibclean.rb
    Library/Formula/blink1.rb
    Library/Formula/cayley.rb
    Library/Formula/cereal.rb
    Library/Formula/cgrep.rb
    Library/Formula/check_postgres.rb
    Library/Formula/cmockery2.rb
    Library/Formula/dante.rb
    Library/Formula/datamash.rb
    Library/Formula/dockutil.rb
    Library/Formula/doitlive.rb
    Library/Formula/elixir-build.rb
    Library/Formula/fig.rb
    Library/Formula/fpc.rb
    Library/Formula/github-release.rb
    Library/Formula/hachoir-metadata.rb
    Library/Formula/harbour.rb
    Library/Formula/httpie.rb
    Library/Formula/hydra-cli.rb
    Library/Formula/ino.rb
    Library/Formula/ipinfo.rb
    Library/Formula/jetty-runner.rb
    Library/Formula/ldc.rb
    Library/Formula/libetonyek.rb
    Library/Formula/libmspub.rb
    Library/Formula/libnice.rb
    Library/Formula/libodfgen.rb
    Library/Formula/libressl.rb
    Library/Formula/libsecret.rb
    Library/Formula/libstrophe.rb
    Library/Formula/libvisio.rb
    Library/Formula/makepkg.rb
    Library/Formula/mat.rb
    Library/Formula/megacmd.rb
    Library/Formula/mercury.rb
    Library/Formula/mesos.rb
    Library/Formula/mozjpeg.rb
    Library/Formula/ocamlsdl.rb
    Library/Formula/onetime.rb
    Library/Formula/openal-soft.rb
    Library/Formula/osh.rb
    Library/Formula/pianod.rb
    Library/Formula/profanity.rb
    Library/Formula/pypy3.rb
    Library/Formula/quazip.rb
    Library/Formula/qwtpolar.rb
    Library/Formula/slurm.rb
    Library/Formula/ssdb.rb
    Library/Formula/storm.rb
    Library/Formula/switchaudio-osx.rb
    Library/Formula/telepathy-gabble.rb
    Library/Formula/telepathy-glib.rb
    Library/Formula/telepathy-idle.rb
    Library/Formula/telepathy-mission-control.rb
    Library/Formula/termshare.rb
    Library/Formula/the_platinum_searcher.rb
    Library/Formula/titan-server.rb
    Library/Formula/transcrypt.rb
    Library/Formula/udpxy.rb
    Library/Formula/whitedb.rb
    Library/Homebrew/formula_assertions.rb
    Library/Homebrew/test/fixtures/receipt.json
    Library/Homebrew/test/fixtures/test.jpg
    Library/Homebrew/test/fixtures/test.png
    Library/Homebrew/test/fixtures/test.tiff
    Library/Homebrew/test/test_bottle_filename.rb
    Library/Homebrew/test/test_tab.rb
    Library/Homebrew/utils/popen.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
Wrapped exception:
Execution of 'brew update' returned 1: error: Your local changes to the following files would be overwritten by merge:
    CONTRIBUTING.md
    Library/Contributions/brew_fish_completion.fish
    Library/Contributions/cmd/brew-aspell-dictionaries.rb
    Library/Contributions/cmd/brew-beer.rb
    Library/Contributions/cmd/brew-bundle-dir.rb
    Library/Contributions/cmd/brew-bundle.rb
    Library/Contributions/cmd/brew-gist-logs.rb
    Library/Contributions/cmd/brew-graph
    Library/Contributions/cmd/brew-pull.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/example-formula.rb
    Library/Contributions/manpages/brew.1.md
    Library/ENV/4.3/cc
    Library/ENV/pkgconfig/10.8/libcurl.pc
    Library/ENV/pkgconfig/10.8/libexslt.pc
    Library/ENV/pkgconfig/10.8/libxml-2.0.pc
    Library/ENV/pkgconfig/10.8/libxslt.pc
    Library/ENV/pkgconfig/10.9
    Library/Formula/aalib.rb
    Library/Formula/aamath.rb
    Library/Formula/aardvark_shell_utils.rb
    Library/Formula/abcm2ps.rb
    Library/Formula/abcmidi.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/advancecomp.rb
    Library/Formula/afflib.rb
    Library/Formula/afio.rb
    Library/Formula/aggregate.rb
    Library/Formula/aha.rb
    Library/Formula/algol68g.rb
    Library/Formula/align.rb
    Library/Formula/alure.rb
    Library/Formula/amtterm.rb
    Library/Formula/analog.rb
    Library/Formula/android-ndk.rb
    Library/Formula/android-sdk.rb
    Library/Formula/ansible.rb
    Library/Formula/ansifilter.rb
    Library/Formula/ant.rb
    Library/Formula/antlr.rb
    Library/Formula/apache-forrest.rb
    Library/Formula/apache-spark.rb
    Library/Formula/apachetop.rb
    Library/Formula/apollo.rb
    Library/Formula/app-engine-java-sdk.rb
    Library/Formula/appscale-tools.rb
    Library/Formula/apt-cacher-ng.rb
    Library/Formula/aqbanking.rb
    Library/Formula/arangodb.rb
    Library/Formula/aria2.rb
    Library/Formula/arp-scan.rb
    Library/Formula/arp-sk.rb
    Library/Formula/arping.rb
    Library/Formula/arpoison.rb
    Library/Formula/ascii.rb
    Library/Formula/assimp.rb
    Library/Formula/aterm.rb
    Library/Formula/aubio.rb
    Library/Formula/auto-scaling.rb
    Library/Formula/autogen.rb
    Library/Formula/autopano-sift-c.rb
    Library/Formula/avian.rb
    Library/Formula/avra.rb
    Library/Formula/avrdude.rb
    Library/Formula/awscli.rb
    Library/Formula/base64.rb
    Library/Formula/basex.rb
    Library/Formula/bash.rb
    Library/Formula/bats.rb
    Library/Formula/bbcp.rb
    Library/Formula/bdw-gc.rb
    Library/Formula/bear.rb
    Library/Formula/beecrypt.rb
    Library/Formula/betty.rb
    Library/Formula/bgrep.rb
    Library/Formula/bind.rb
    Library/Formula/bindfs.rb
    Library/Formula/binutils.rb
    Library/Formula/binwalk.rb
    Library/Formula/bitchx.rb
    Library/Formula/bitlbee.rb
    Library/Formula/bmon.rb
    Library/Formula/boost.rb
    Library/Formula/boot2docker.rb
    Library/Formula/bro.rb
    Library/Formula/bup.rb
    Library/Formula/burp.rb
    Library/Formula/cabal-install.rb
    Library/Formula/calc.rb
    Library/Formula/camlistore.rb
    Library/Formula/cask.rb
    Library/Formula/cassandra.rb
    Library/Formula/cbmbasic.rb
    Library/Formula/ccal.rb
    Library/Formula/ccextractor.rb
    Library/Formula/cctools-headers.rb
    Library/Formula/cdecl.rb
    Library/Formula/cdrtools.rb
    Library/Formula/cfengine.rb
    Library/Formula/cfitsio.rb
    Library/Formula/cgdb.rb
    Library/Formula/cheat.rb
    Library/Formula/check.rb
    Library/Formula/chibi-scheme.rb
    Library/Formula/chicken.rb
    Library/Formula/chisel.rb
    Library/Formula/chkrootkit.rb
    Library/Formula/chmlib.rb
    Library/Formula/cimg.rb
    Library/Formula/cksfv.rb
    Library/Formula/clamav.rb
    Library/Formula/clhep.rb
    Library/Formula/clib.rb
    Library/Formula/clipsafe.rb
    Library/Formula/cln.rb
    Library/Formula/cloc.rb
    Library/Formula/clojurescript.rb
    Library/Formula/cloog.rb
    Library/Formula/closure-compiler.rb
    Library/Formula/clucene.rb
    Library/Formula/cmake.rb
    Library/Formula/cmus.rb
    Library/Formula/concurrencykit.rb
    Library/Formula/cookiecutter.rb
    Library/Formula/coq.rb
    Library/For
error: The following untracked working tree files would be overwritten by merge:
    Library/Aliases/boot2docker-cli
    Library/Aliases/pt
    Library/Contributions/cmd/brew-versions.rb
    Library/ENV/pkgconfig/10.10/libcurl.pc
    Library/ENV/pkgconfig/10.10/libexslt.pc
    Library/ENV/pkgconfig/10.10/libxml-2.0.pc
    Library/ENV/pkgconfig/10.10/libxslt.pc
    Library/Formula/ats2-postiats.rb
    Library/Formula/bibclean.rb
    Library/Formula/blink1.rb
    Library/Formula/cayley.rb
    Library/Formula/cereal.rb
    Library/Formula/cgrep.rb
    Library/Formula/check_postgres.rb
    Library/Formula/cmockery2.rb
    Library/Formula/dante.rb
    Library/Formula/datamash.rb
    Library/Formula/dockutil.rb
    Library/Formula/doitlive.rb
    Library/Formula/elixir-build.rb
    Library/Formula/fig.rb
    Library/Formula/fpc.rb
    Library/Formula/github-release.rb
    Library/Formula/hachoir-metadata.rb
    Library/Formula/harbour.rb
    Library/Formula/httpie.rb
    Library/Formula/hydra-cli.rb
    Library/Formula/ino.rb
    Library/Formula/ipinfo.rb
    Library/Formula/jetty-runner.rb
    Library/Formula/ldc.rb
    Library/Formula/libetonyek.rb
    Library/Formula/libmspub.rb
    Library/Formula/libnice.rb
    Library/Formula/libodfgen.rb
    Library/Formula/libressl.rb
    Library/Formula/libsecret.rb
    Library/Formula/libstrophe.rb
    Library/Formula/libvisio.rb
    Library/Formula/makepkg.rb
    Library/Formula/mat.rb
    Library/Formula/megacmd.rb
    Library/Formula/mercury.rb
    Library/Formula/mesos.rb
    Library/Formula/mozjpeg.rb
    Library/Formula/ocamlsdl.rb
    Library/Formula/onetime.rb
    Library/Formula/openal-soft.rb
    Library/Formula/osh.rb
    Library/Formula/pianod.rb
    Library/Formula/profanity.rb
    Library/Formula/pypy3.rb
    Library/Formula/quazip.rb
    Library/Formula/qwtpolar.rb
    Library/Formula/slurm.rb
    Library/Formula/ssdb.rb
    Library/Formula/storm.rb
    Library/Formula/switchaudio-osx.rb
    Library/Formula/telepathy-gabble.rb
    Library/Formula/telepathy-glib.rb
    Library/Formula/telepathy-idle.rb
    Library/Formula/telepathy-mission-control.rb
    Library/Formula/termshare.rb
    Library/Formula/the_platinum_searcher.rb
    Library/Formula/titan-server.rb
    Library/Formula/transcrypt.rb
    Library/Formula/udpxy.rb
    Library/Formula/whitedb.rb
    Library/Homebrew/formula_assertions.rb
    Library/Homebrew/test/fixtures/receipt.json
    Library/Homebrew/test/fixtures/test.jpg
    Library/Homebrew/test/fixtures/test.png
    Library/Homebrew/test/fixtures/test.tiff
    Library/Homebrew/test/test_bottle_filename.rb
    Library/Homebrew/test/test_tab.rb
    Library/Homebrew/utils/popen.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
2014-08-20 17:24:37 -0400 /Stage[main]/Hub/Package[hub]/ensure (err): change from 1.12.1 to 1.12.2 failed: Could not update: Execution of 'brew update' returned 1: error: Your local changes to the following files would be overwritten by merge:
    CONTRIBUTING.md
    Library/Contributions/brew_fish_completion.fish
    Library/Contributions/cmd/brew-aspell-dictionaries.rb
    Library/Contributions/cmd/brew-beer.rb
    Library/Contributions/cmd/brew-bundle-dir.rb
    Library/Contributions/cmd/brew-bundle.rb
    Library/Contributions/cmd/brew-gist-logs.rb
    Library/Contributions/cmd/brew-graph
    Library/Contributions/cmd/brew-pull.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/example-formula.rb
    Library/Contributions/manpages/brew.1.md
    Library/ENV/4.3/cc
    Library/ENV/pkgconfig/10.8/libcurl.pc
    Library/ENV/pkgconfig/10.8/libexslt.pc
    Library/ENV/pkgconfig/10.8/libxml-2.0.pc
    Library/ENV/pkgconfig/10.8/libxslt.pc
    Library/ENV/pkgconfig/10.9
    Library/Formula/aalib.rb
    Library/Formula/aamath.rb
    Library/Formula/aardvark_shell_utils.rb
    Library/Formula/abcm2ps.rb
    Library/Formula/abcmidi.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/advancecomp.rb
    Library/Formula/afflib.rb
    Library/Formula/afio.rb
    Library/Formula/aggregate.rb
    Library/Formula/aha.rb
    Library/Formula/algol68g.rb
    Library/Formula/align.rb
    Library/Formula/alure.rb
    Library/Formula/amtterm.rb
    Library/Formula/analog.rb
    Library/Formula/android-ndk.rb
    Library/Formula/android-sdk.rb
    Library/Formula/ansible.rb
    Library/Formula/ansifilter.rb
    Library/Formula/ant.rb
    Library/Formula/antlr.rb
    Library/Formula/apache-forrest.rb
    Library/Formula/apache-spark.rb
    Library/Formula/apachetop.rb
    Library/Formula/apollo.rb
    Library/Formula/app-engine-java-sdk.rb
    Library/Formula/appscale-tools.rb
    Library/Formula/apt-cacher-ng.rb
    Library/Formula/aqbanking.rb
    Library/Formula/arangodb.rb
    Library/Formula/aria2.rb
    Library/Formula/arp-scan.rb
    Library/Formula/arp-sk.rb
    Library/Formula/arping.rb
    Library/Formula/arpoison.rb
    Library/Formula/ascii.rb
    Library/Formula/assimp.rb
    Library/Formula/aterm.rb
    Library/Formula/aubio.rb
    Library/Formula/auto-scaling.rb
    Library/Formula/autogen.rb
    Library/Formula/autopano-sift-c.rb
    Library/Formula/avian.rb
    Library/Formula/avra.rb
    Library/Formula/avrdude.rb
    Library/Formula/awscli.rb
    Library/Formula/base64.rb
    Library/Formula/basex.rb
    Library/Formula/bash.rb
    Library/Formula/bats.rb
    Library/Formula/bbcp.rb
    Library/Formula/bdw-gc.rb
    Library/Formula/bear.rb
    Library/Formula/beecrypt.rb
    Library/Formula/betty.rb
    Library/Formula/bgrep.rb
    Library/Formula/bind.rb
    Library/Formula/bindfs.rb
    Library/Formula/binutils.rb
    Library/Formula/binwalk.rb
    Library/Formula/bitchx.rb
    Library/Formula/bitlbee.rb
    Library/Formula/bmon.rb
    Library/Formula/boost.rb
    Library/Formula/boot2docker.rb
    Library/Formula/bro.rb
    Library/Formula/bup.rb
    Library/Formula/burp.rb
    Library/Formula/cabal-install.rb
    Library/Formula/calc.rb
    Library/Formula/camlistore.rb
    Library/Formula/cask.rb
    Library/Formula/cassandra.rb
    Library/Formula/cbmbasic.rb
    Library/Formula/ccal.rb
    Library/Formula/ccextractor.rb
    Library/Formula/cctools-headers.rb
    Library/Formula/cdecl.rb
    Library/Formula/cdrtools.rb
    Library/Formula/cfengine.rb
    Library/Formula/cfitsio.rb
    Library/Formula/cgdb.rb
    Library/Formula/cheat.rb
    Library/Formula/check.rb
    Library/Formula/chibi-scheme.rb
    Library/Formula/chicken.rb
    Library/Formula/chisel.rb
    Library/Formula/chkrootkit.rb
    Library/Formula/chmlib.rb
    Library/Formula/cimg.rb
    Library/Formula/cksfv.rb
    Library/Formula/clamav.rb
    Library/Formula/clhep.rb
    Library/Formula/clib.rb
    Library/Formula/clipsafe.rb
    Library/Formula/cln.rb
    Library/Formula/cloc.rb
    Library/Formula/clojurescript.rb
    Library/Formula/cloog.rb
    Library/Formula/closure-compiler.rb
    Library/Formula/clucene.rb
    Library/Formula/cmake.rb
    Library/Formula/cmus.rb
    Library/Formula/concurrencykit.rb
    Library/Formula/cookiecutter.rb
    Library/Formula/coq.rb
    Library/For
error: The following untracked working tree files would be overwritten by merge:
    Library/Aliases/boot2docker-cli
    Library/Aliases/pt
    Library/Contributions/cmd/brew-versions.rb
    Library/ENV/pkgconfig/10.10/libcurl.pc
    Library/ENV/pkgconfig/10.10/libexslt.pc
    Library/ENV/pkgconfig/10.10/libxml-2.0.pc
    Library/ENV/pkgconfig/10.10/libxslt.pc
    Library/Formula/ats2-postiats.rb
    Library/Formula/bibclean.rb
    Library/Formula/blink1.rb
    Library/Formula/cayley.rb
    Library/Formula/cereal.rb
    Library/Formula/cgrep.rb
    Library/Formula/check_postgres.rb
    Library/Formula/cmockery2.rb
    Library/Formula/dante.rb
    Library/Formula/datamash.rb
    Library/Formula/dockutil.rb
    Library/Formula/doitlive.rb
    Library/Formula/elixir-build.rb
    Library/Formula/fig.rb
    Library/Formula/fpc.rb
    Library/Formula/github-release.rb
    Library/Formula/hachoir-metadata.rb
    Library/Formula/harbour.rb
    Library/Formula/httpie.rb
    Library/Formula/hydra-cli.rb
    Library/Formula/ino.rb
    Library/Formula/ipinfo.rb
    Library/Formula/jetty-runner.rb
    Library/Formula/ldc.rb
    Library/Formula/libetonyek.rb
    Library/Formula/libmspub.rb
    Library/Formula/libnice.rb
    Library/Formula/libodfgen.rb
    Library/Formula/libressl.rb
    Library/Formula/libsecret.rb
    Library/Formula/libstrophe.rb
    Library/Formula/libvisio.rb
    Library/Formula/makepkg.rb
    Library/Formula/mat.rb
    Library/Formula/megacmd.rb
    Library/Formula/mercury.rb
    Library/Formula/mesos.rb
    Library/Formula/mozjpeg.rb
    Library/Formula/ocamlsdl.rb
    Library/Formula/onetime.rb
    Library/Formula/openal-soft.rb
    Library/Formula/osh.rb
    Library/Formula/pianod.rb
    Library/Formula/profanity.rb
    Library/Formula/pypy3.rb
    Library/Formula/quazip.rb
    Library/Formula/qwtpolar.rb
    Library/Formula/slurm.rb
    Library/Formula/ssdb.rb
    Library/Formula/storm.rb
    Library/Formula/switchaudio-osx.rb
    Library/Formula/telepathy-gabble.rb
    Library/Formula/telepathy-glib.rb
    Library/Formula/telepathy-idle.rb
    Library/Formula/telepathy-mission-control.rb
    Library/Formula/termshare.rb
    Library/Formula/the_platinum_searcher.rb
    Library/Formula/titan-server.rb
    Library/Formula/transcrypt.rb
    Library/Formula/udpxy.rb
    Library/Formula/whitedb.rb
    Library/Homebrew/formula_assertions.rb
    Library/Homebrew/test/fixtures/receipt.json
    Library/Homebrew/test/fixtures/test.jpg
    Library/Homebrew/test/fixtures/test.png
    Library/Homebrew/test/fixtures/test.tiff
    Library/Homebrew/test/test_bottle_filename.rb
    Library/Homebrew/test/test_tab.rb
    Library/Homebrew/utils/popen.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
2014-08-20 17:24:38 -0400 Package[boxen/brews/gcc48](provider=homebrew) (notice): Updating homebrew formulas
2014-08-20 17:24:49 -0400 Puppet (err): Could not update: Execution of 'brew update' returned 1: error: Your local changes to the following files would be overwritten by merge:
    CONTRIBUTING.md
    Library/Contributions/brew_fish_completion.fish
    Library/Contributions/cmd/brew-aspell-dictionaries.rb
    Library/Contributions/cmd/brew-beer.rb
    Library/Contributions/cmd/brew-bundle-dir.rb
    Library/Contributions/cmd/brew-bundle.rb
    Library/Contributions/cmd/brew-gist-logs.rb
    Library/Contributions/cmd/brew-graph
    Library/Contributions/cmd/brew-pull.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/example-formula.rb
    Library/Contributions/manpages/brew.1.md
    Library/ENV/4.3/cc
    Library/ENV/pkgconfig/10.8/libcurl.pc
    Library/ENV/pkgconfig/10.8/libexslt.pc
    Library/ENV/pkgconfig/10.8/libxml-2.0.pc
    Library/ENV/pkgconfig/10.8/libxslt.pc
    Library/ENV/pkgconfig/10.9
    Library/Formula/aalib.rb
    Library/Formula/aamath.rb
    Library/Formula/aardvark_shell_utils.rb
    Library/Formula/abcm2ps.rb
    Library/Formula/abcmidi.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/advancecomp.rb
    Library/Formula/afflib.rb
    Library/Formula/afio.rb
    Library/Formula/aggregate.rb
    Library/Formula/aha.rb
    Library/Formula/algol68g.rb
    Library/Formula/align.rb
    Library/Formula/alure.rb
    Library/Formula/amtterm.rb
    Library/Formula/analog.rb
    Library/Formula/android-ndk.rb
    Library/Formula/android-sdk.rb
    Library/Formula/ansible.rb
    Library/Formula/ansifilter.rb
    Library/Formula/ant.rb
    Library/Formula/antlr.rb
    Library/Formula/apache-forrest.rb
    Library/Formula/apache-spark.rb
    Library/Formula/apachetop.rb
    Library/Formula/apollo.rb
    Library/Formula/app-engine-java-sdk.rb
    Library/Formula/appscale-tools.rb
    Library/Formula/apt-cacher-ng.rb
    Library/Formula/aqbanking.rb
    Library/Formula/arangodb.rb
    Library/Formula/aria2.rb
    Library/Formula/arp-scan.rb
    Library/Formula/arp-sk.rb
    Library/Formula/arping.rb
    Library/Formula/arpoison.rb
    Library/Formula/ascii.rb
    Library/Formula/assimp.rb
    Library/Formula/aterm.rb
    Library/Formula/aubio.rb
    Library/Formula/auto-scaling.rb
    Library/Formula/autogen.rb
    Library/Formula/autopano-sift-c.rb
    Library/Formula/avian.rb
    Library/Formula/avra.rb
    Library/Formula/avrdude.rb
    Library/Formula/awscli.rb
    Library/Formula/base64.rb
    Library/Formula/basex.rb
    Library/Formula/bash.rb
    Library/Formula/bats.rb
    Library/Formula/bbcp.rb
    Library/Formula/bdw-gc.rb
    Library/Formula/bear.rb
    Library/Formula/beecrypt.rb
    Library/Formula/betty.rb
    Library/Formula/bgrep.rb
    Library/Formula/bind.rb
    Library/Formula/bindfs.rb
    Library/Formula/binutils.rb
    Library/Formula/binwalk.rb
    Library/Formula/bitchx.rb
    Library/Formula/bitlbee.rb
    Library/Formula/bmon.rb
    Library/Formula/boost.rb
    Library/Formula/boot2docker.rb
    Library/Formula/bro.rb
    Library/Formula/bup.rb
    Library/Formula/burp.rb
    Library/Formula/cabal-install.rb
    Library/Formula/calc.rb
    Library/Formula/camlistore.rb
    Library/Formula/cask.rb
    Library/Formula/cassandra.rb
    Library/Formula/cbmbasic.rb
    Library/Formula/ccal.rb
    Library/Formula/ccextractor.rb
    Library/Formula/cctools-headers.rb
    Library/Formula/cdecl.rb
    Library/Formula/cdrtools.rb
    Library/Formula/cfengine.rb
    Library/Formula/cfitsio.rb
    Library/Formula/cgdb.rb
    Library/Formula/cheat.rb
    Library/Formula/check.rb
    Library/Formula/chibi-scheme.rb
    Library/Formula/chicken.rb
    Library/Formula/chisel.rb
    Library/Formula/chkrootkit.rb
    Library/Formula/chmlib.rb
    Library/Formula/cimg.rb
    Library/Formula/cksfv.rb
    Library/Formula/clamav.rb
    Library/Formula/clhep.rb
    Library/Formula/clib.rb
    Library/Formula/clipsafe.rb
    Library/Formula/cln.rb
    Library/Formula/cloc.rb
    Library/Formula/clojurescript.rb
    Library/Formula/cloog.rb
    Library/Formula/closure-compiler.rb
    Library/Formula/clucene.rb
    Library/Formula/cmake.rb
    Library/Formula/cmus.rb
    Library/Formula/concurrencykit.rb
    Library/Formula/cookiecutter.rb
    Library/Formula/coq.rb
    Library/For
error: The following untracked working tree files would be overwritten by merge:
    Library/Aliases/boot2docker-cli
    Library/Aliases/pt
    Library/Contributions/cmd/brew-versions.rb
    Library/ENV/pkgconfig/10.10/libcurl.pc
    Library/ENV/pkgconfig/10.10/libexslt.pc
    Library/ENV/pkgconfig/10.10/libxml-2.0.pc
    Library/ENV/pkgconfig/10.10/libxslt.pc
    Library/Formula/ats2-postiats.rb
    Library/Formula/bibclean.rb
    Library/Formula/blink1.rb
    Library/Formula/cayley.rb
    Library/Formula/cereal.rb
    Library/Formula/cgrep.rb
    Library/Formula/check_postgres.rb
    Library/Formula/cmockery2.rb
    Library/Formula/dante.rb
    Library/Formula/datamash.rb
    Library/Formula/dockutil.rb
    Library/Formula/doitlive.rb
    Library/Formula/elixir-build.rb
    Library/Formula/fig.rb
    Library/Formula/fpc.rb
    Library/Formula/github-release.rb
    Library/Formula/hachoir-metadata.rb
    Library/Formula/harbour.rb
    Library/Formula/httpie.rb
    Library/Formula/hydra-cli.rb
    Library/Formula/ino.rb
    Library/Formula/ipinfo.rb
    Library/Formula/jetty-runner.rb
    Library/Formula/ldc.rb
    Library/Formula/libetonyek.rb
    Library/Formula/libmspub.rb
    Library/Formula/libnice.rb
    Library/Formula/libodfgen.rb
    Library/Formula/libressl.rb
    Library/Formula/libsecret.rb
    Library/Formula/libstrophe.rb
    Library/Formula/libvisio.rb
    Library/Formula/makepkg.rb
    Library/Formula/mat.rb
    Library/Formula/megacmd.rb
    Library/Formula/mercury.rb
    Library/Formula/mesos.rb
    Library/Formula/mozjpeg.rb
    Library/Formula/ocamlsdl.rb
    Library/Formula/onetime.rb
    Library/Formula/openal-soft.rb
    Library/Formula/osh.rb
    Library/Formula/pianod.rb
    Library/Formula/profanity.rb
    Library/Formula/pypy3.rb
    Library/Formula/quazip.rb
    Library/Formula/qwtpolar.rb
    Library/Formula/slurm.rb
    Library/Formula/ssdb.rb
    Library/Formula/storm.rb
    Library/Formula/switchaudio-osx.rb
    Library/Formula/telepathy-gabble.rb
    Library/Formula/telepathy-glib.rb
    Library/Formula/telepathy-idle.rb
    Library/Formula/telepathy-mission-control.rb
    Library/Formula/termshare.rb
    Library/Formula/the_platinum_searcher.rb
    Library/Formula/titan-server.rb
    Library/Formula/transcrypt.rb
    Library/Formula/udpxy.rb
    Library/Formula/whitedb.rb
    Library/Homebrew/formula_assertions.rb
    Library/Homebrew/test/fixtures/receipt.json
    Library/Homebrew/test/fixtures/test.jpg
    Library/Homebrew/test/fixtures/test.png
    Library/Homebrew/test/fixtures/test.tiff
    Library/Homebrew/test/test_bottle_filename.rb
    Library/Homebrew/test/test_tab.rb
    Library/Homebrew/utils/popen.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
Wrapped exception:
Execution of 'brew update' returned 1: error: Your local changes to the following files would be overwritten by merge:
    CONTRIBUTING.md
    Library/Contributions/brew_fish_completion.fish
    Library/Contributions/cmd/brew-aspell-dictionaries.rb
    Library/Contributions/cmd/brew-beer.rb
    Library/Contributions/cmd/brew-bundle-dir.rb
    Library/Contributions/cmd/brew-bundle.rb
    Library/Contributions/cmd/brew-gist-logs.rb
    Library/Contributions/cmd/brew-graph
    Library/Contributions/cmd/brew-pull.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/example-formula.rb
    Library/Contributions/manpages/brew.1.md
    Library/ENV/4.3/cc
    Library/ENV/pkgconfig/10.8/libcurl.pc
    Library/ENV/pkgconfig/10.8/libexslt.pc
    Library/ENV/pkgconfig/10.8/libxml-2.0.pc
    Library/ENV/pkgconfig/10.8/libxslt.pc
    Library/ENV/pkgconfig/10.9
    Library/Formula/aalib.rb
    Library/Formula/aamath.rb
    Library/Formula/aardvark_shell_utils.rb
    Library/Formula/abcm2ps.rb
    Library/Formula/abcmidi.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/advancecomp.rb
    Library/Formula/afflib.rb
    Library/Formula/afio.rb
    Library/Formula/aggregate.rb
    Library/Formula/aha.rb
    Library/Formula/algol68g.rb
    Library/Formula/align.rb
    Library/Formula/alure.rb
    Library/Formula/amtterm.rb
    Library/Formula/analog.rb
    Library/Formula/android-ndk.rb
    Library/Formula/android-sdk.rb
    Library/Formula/ansible.rb
    Library/Formula/ansifilter.rb
    Library/Formula/ant.rb
    Library/Formula/antlr.rb
    Library/Formula/apache-forrest.rb
    Library/Formula/apache-spark.rb
    Library/Formula/apachetop.rb
    Library/Formula/apollo.rb
    Library/Formula/app-engine-java-sdk.rb
    Library/Formula/appscale-tools.rb
    Library/Formula/apt-cacher-ng.rb
    Library/Formula/aqbanking.rb
    Library/Formula/arangodb.rb
    Library/Formula/aria2.rb
    Library/Formula/arp-scan.rb
    Library/Formula/arp-sk.rb
    Library/Formula/arping.rb
    Library/Formula/arpoison.rb
    Library/Formula/ascii.rb
    Library/Formula/assimp.rb
    Library/Formula/aterm.rb
    Library/Formula/aubio.rb
    Library/Formula/auto-scaling.rb
    Library/Formula/autogen.rb
    Library/Formula/autopano-sift-c.rb
    Library/Formula/avian.rb
    Library/Formula/avra.rb
    Library/Formula/avrdude.rb
    Library/Formula/awscli.rb
    Library/Formula/base64.rb
    Library/Formula/basex.rb
    Library/Formula/bash.rb
    Library/Formula/bats.rb
    Library/Formula/bbcp.rb
    Library/Formula/bdw-gc.rb
    Library/Formula/bear.rb
    Library/Formula/beecrypt.rb
    Library/Formula/betty.rb
    Library/Formula/bgrep.rb
    Library/Formula/bind.rb
    Library/Formula/bindfs.rb
    Library/Formula/binutils.rb
    Library/Formula/binwalk.rb
    Library/Formula/bitchx.rb
    Library/Formula/bitlbee.rb
    Library/Formula/bmon.rb
    Library/Formula/boost.rb
    Library/Formula/boot2docker.rb
    Library/Formula/bro.rb
    Library/Formula/bup.rb
    Library/Formula/burp.rb
    Library/Formula/cabal-install.rb
    Library/Formula/calc.rb
    Library/Formula/camlistore.rb
    Library/Formula/cask.rb
    Library/Formula/cassandra.rb
    Library/Formula/cbmbasic.rb
    Library/Formula/ccal.rb
    Library/Formula/ccextractor.rb
    Library/Formula/cctools-headers.rb
    Library/Formula/cdecl.rb
    Library/Formula/cdrtools.rb
    Library/Formula/cfengine.rb
    Library/Formula/cfitsio.rb
    Library/Formula/cgdb.rb
    Library/Formula/cheat.rb
    Library/Formula/check.rb
    Library/Formula/chibi-scheme.rb
    Library/Formula/chicken.rb
    Library/Formula/chisel.rb
    Library/Formula/chkrootkit.rb
    Library/Formula/chmlib.rb
    Library/Formula/cimg.rb
    Library/Formula/cksfv.rb
    Library/Formula/clamav.rb
    Library/Formula/clhep.rb
    Library/Formula/clib.rb
    Library/Formula/clipsafe.rb
    Library/Formula/cln.rb
    Library/Formula/cloc.rb
    Library/Formula/clojurescript.rb
    Library/Formula/cloog.rb
    Library/Formula/closure-compiler.rb
    Library/Formula/clucene.rb
    Library/Formula/cmake.rb
    Library/Formula/cmus.rb
    Library/Formula/concurrencykit.rb
    Library/Formula/cookiecutter.rb
    Library/Formula/coq.rb
    Library/For
error: The following untracked working tree files would be overwritten by merge:
    Library/Aliases/boot2docker-cli
    Library/Aliases/pt
    Library/Contributions/cmd/brew-versions.rb
    Library/ENV/pkgconfig/10.10/libcurl.pc
    Library/ENV/pkgconfig/10.10/libexslt.pc
    Library/ENV/pkgconfig/10.10/libxml-2.0.pc
    Library/ENV/pkgconfig/10.10/libxslt.pc
    Library/Formula/ats2-postiats.rb
    Library/Formula/bibclean.rb
    Library/Formula/blink1.rb
    Library/Formula/cayley.rb
    Library/Formula/cereal.rb
    Library/Formula/cgrep.rb
    Library/Formula/check_postgres.rb
    Library/Formula/cmockery2.rb
    Library/Formula/dante.rb
    Library/Formula/datamash.rb
    Library/Formula/dockutil.rb
    Library/Formula/doitlive.rb
    Library/Formula/elixir-build.rb
    Library/Formula/fig.rb
    Library/Formula/fpc.rb
    Library/Formula/github-release.rb
    Library/Formula/hachoir-metadata.rb
    Library/Formula/harbour.rb
    Library/Formula/httpie.rb
    Library/Formula/hydra-cli.rb
    Library/Formula/ino.rb
    Library/Formula/ipinfo.rb
    Library/Formula/jetty-runner.rb
    Library/Formula/ldc.rb
    Library/Formula/libetonyek.rb
    Library/Formula/libmspub.rb
    Library/Formula/libnice.rb
    Library/Formula/libodfgen.rb
    Library/Formula/libressl.rb
    Library/Formula/libsecret.rb
    Library/Formula/libstrophe.rb
    Library/Formula/libvisio.rb
    Library/Formula/makepkg.rb
    Library/Formula/mat.rb
    Library/Formula/megacmd.rb
    Library/Formula/mercury.rb
    Library/Formula/mesos.rb
    Library/Formula/mozjpeg.rb
    Library/Formula/ocamlsdl.rb
    Library/Formula/onetime.rb
    Library/Formula/openal-soft.rb
    Library/Formula/osh.rb
    Library/Formula/pianod.rb
    Library/Formula/profanity.rb
    Library/Formula/pypy3.rb
    Library/Formula/quazip.rb
    Library/Formula/qwtpolar.rb
    Library/Formula/slurm.rb
    Library/Formula/ssdb.rb
    Library/Formula/storm.rb
    Library/Formula/switchaudio-osx.rb
    Library/Formula/telepathy-gabble.rb
    Library/Formula/telepathy-glib.rb
    Library/Formula/telepathy-idle.rb
    Library/Formula/telepathy-mission-control.rb
    Library/Formula/termshare.rb
    Library/Formula/the_platinum_searcher.rb
    Library/Formula/titan-server.rb
    Library/Formula/transcrypt.rb
    Library/Formula/udpxy.rb
    Library/Formula/whitedb.rb
    Library/Homebrew/formula_assertions.rb
    Library/Homebrew/test/fixtures/receipt.json
    Library/Homebrew/test/fixtures/test.jpg
    Library/Homebrew/test/fixtures/test.png
    Library/Homebrew/test/fixtures/test.tiff
    Library/Homebrew/test/test_bottle_filename.rb
    Library/Homebrew/test/test_tab.rb
    Library/Homebrew/utils/popen.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
2014-08-20 17:24:49 -0400 /Stage[main]/Gcc/Package[boxen/brews/gcc48]/ensure (err): change from 4.8.1 to 4.8.3-boxen1 failed: Could not update: Execution of 'brew update' returned 1: error: Your local changes to the following files would be overwritten by merge:
    CONTRIBUTING.md
    Library/Contributions/brew_fish_completion.fish
    Library/Contributions/cmd/brew-aspell-dictionaries.rb
    Library/Contributions/cmd/brew-beer.rb
    Library/Contributions/cmd/brew-bundle-dir.rb
    Library/Contributions/cmd/brew-bundle.rb
    Library/Contributions/cmd/brew-gist-logs.rb
    Library/Contributions/cmd/brew-graph
    Library/Contributions/cmd/brew-pull.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/example-formula.rb
    Library/Contributions/manpages/brew.1.md
    Library/ENV/4.3/cc
    Library/ENV/pkgconfig/10.8/libcurl.pc
    Library/ENV/pkgconfig/10.8/libexslt.pc
    Library/ENV/pkgconfig/10.8/libxml-2.0.pc
    Library/ENV/pkgconfig/10.8/libxslt.pc
    Library/ENV/pkgconfig/10.9
    Library/Formula/aalib.rb
    Library/Formula/aamath.rb
    Library/Formula/aardvark_shell_utils.rb
    Library/Formula/abcm2ps.rb
    Library/Formula/abcmidi.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/advancecomp.rb
    Library/Formula/afflib.rb
    Library/Formula/afio.rb
    Library/Formula/aggregate.rb
    Library/Formula/aha.rb
    Library/Formula/algol68g.rb
    Library/Formula/align.rb
    Library/Formula/alure.rb
    Library/Formula/amtterm.rb
    Library/Formula/analog.rb
    Library/Formula/android-ndk.rb
    Library/Formula/android-sdk.rb
    Library/Formula/ansible.rb
    Library/Formula/ansifilter.rb
    Library/Formula/ant.rb
    Library/Formula/antlr.rb
    Library/Formula/apache-forrest.rb
    Library/Formula/apache-spark.rb
    Library/Formula/apachetop.rb
    Library/Formula/apollo.rb
    Library/Formula/app-engine-java-sdk.rb
    Library/Formula/appscale-tools.rb
    Library/Formula/apt-cacher-ng.rb
    Library/Formula/aqbanking.rb
    Library/Formula/arangodb.rb
    Library/Formula/aria2.rb
    Library/Formula/arp-scan.rb
    Library/Formula/arp-sk.rb
    Library/Formula/arping.rb
    Library/Formula/arpoison.rb
    Library/Formula/ascii.rb
    Library/Formula/assimp.rb
    Library/Formula/aterm.rb
    Library/Formula/aubio.rb
    Library/Formula/auto-scaling.rb
    Library/Formula/autogen.rb
    Library/Formula/autopano-sift-c.rb
    Library/Formula/avian.rb
    Library/Formula/avra.rb
    Library/Formula/avrdude.rb
    Library/Formula/awscli.rb
    Library/Formula/base64.rb
    Library/Formula/basex.rb
    Library/Formula/bash.rb
    Library/Formula/bats.rb
    Library/Formula/bbcp.rb
    Library/Formula/bdw-gc.rb
    Library/Formula/bear.rb
    Library/Formula/beecrypt.rb
    Library/Formula/betty.rb
    Library/Formula/bgrep.rb
    Library/Formula/bind.rb
    Library/Formula/bindfs.rb
    Library/Formula/binutils.rb
    Library/Formula/binwalk.rb
    Library/Formula/bitchx.rb
    Library/Formula/bitlbee.rb
    Library/Formula/bmon.rb
    Library/Formula/boost.rb
    Library/Formula/boot2docker.rb
    Library/Formula/bro.rb
    Library/Formula/bup.rb
    Library/Formula/burp.rb
    Library/Formula/cabal-install.rb
    Library/Formula/calc.rb
    Library/Formula/camlistore.rb
    Library/Formula/cask.rb
    Library/Formula/cassandra.rb
    Library/Formula/cbmbasic.rb
    Library/Formula/ccal.rb
    Library/Formula/ccextractor.rb
    Library/Formula/cctools-headers.rb
    Library/Formula/cdecl.rb
    Library/Formula/cdrtools.rb
    Library/Formula/cfengine.rb
    Library/Formula/cfitsio.rb
    Library/Formula/cgdb.rb
    Library/Formula/cheat.rb
    Library/Formula/check.rb
    Library/Formula/chibi-scheme.rb
    Library/Formula/chicken.rb
    Library/Formula/chisel.rb
    Library/Formula/chkrootkit.rb
    Library/Formula/chmlib.rb
    Library/Formula/cimg.rb
    Library/Formula/cksfv.rb
    Library/Formula/clamav.rb
    Library/Formula/clhep.rb
    Library/Formula/clib.rb
    Library/Formula/clipsafe.rb
    Library/Formula/cln.rb
    Library/Formula/cloc.rb
    Library/Formula/clojurescript.rb
    Library/Formula/cloog.rb
    Library/Formula/closure-compiler.rb
    Library/Formula/clucene.rb
    Library/Formula/cmake.rb
    Library/Formula/cmus.rb
    Library/Formula/concurrencykit.rb
    Library/Formula/cookiecutter.rb
    Library/Formula/coq.rb
    Library/For
error: The following untracked working tree files would be overwritten by merge:
    Library/Aliases/boot2docker-cli
    Library/Aliases/pt
    Library/Contributions/cmd/brew-versions.rb
    Library/ENV/pkgconfig/10.10/libcurl.pc
    Library/ENV/pkgconfig/10.10/libexslt.pc
    Library/ENV/pkgconfig/10.10/libxml-2.0.pc
    Library/ENV/pkgconfig/10.10/libxslt.pc
    Library/Formula/ats2-postiats.rb
    Library/Formula/bibclean.rb
    Library/Formula/blink1.rb
    Library/Formula/cayley.rb
    Library/Formula/cereal.rb
    Library/Formula/cgrep.rb
    Library/Formula/check_postgres.rb
    Library/Formula/cmockery2.rb
    Library/Formula/dante.rb
    Library/Formula/datamash.rb
    Library/Formula/dockutil.rb
    Library/Formula/doitlive.rb
    Library/Formula/elixir-build.rb
    Library/Formula/fig.rb
    Library/Formula/fpc.rb
    Library/Formula/github-release.rb
    Library/Formula/hachoir-metadata.rb
    Library/Formula/harbour.rb
    Library/Formula/httpie.rb
    Library/Formula/hydra-cli.rb
    Library/Formula/ino.rb
    Library/Formula/ipinfo.rb
    Library/Formula/jetty-runner.rb
    Library/Formula/ldc.rb
    Library/Formula/libetonyek.rb
    Library/Formula/libmspub.rb
    Library/Formula/libnice.rb
    Library/Formula/libodfgen.rb
    Library/Formula/libressl.rb
    Library/Formula/libsecret.rb
    Library/Formula/libstrophe.rb
    Library/Formula/libvisio.rb
    Library/Formula/makepkg.rb
    Library/Formula/mat.rb
    Library/Formula/megacmd.rb
    Library/Formula/mercury.rb
    Library/Formula/mesos.rb
    Library/Formula/mozjpeg.rb
    Library/Formula/ocamlsdl.rb
    Library/Formula/onetime.rb
    Library/Formula/openal-soft.rb
    Library/Formula/osh.rb
    Library/Formula/pianod.rb
    Library/Formula/profanity.rb
    Library/Formula/pypy3.rb
    Library/Formula/quazip.rb
    Library/Formula/qwtpolar.rb
    Library/Formula/slurm.rb
    Library/Formula/ssdb.rb
    Library/Formula/storm.rb
    Library/Formula/switchaudio-osx.rb
    Library/Formula/telepathy-gabble.rb
    Library/Formula/telepathy-glib.rb
    Library/Formula/telepathy-idle.rb
    Library/Formula/telepathy-mission-control.rb
    Library/Formula/termshare.rb
    Library/Formula/the_platinum_searcher.rb
    Library/Formula/titan-server.rb
    Library/Formula/transcrypt.rb
    Library/Formula/udpxy.rb
    Library/Formula/whitedb.rb
    Library/Homebrew/formula_assertions.rb
    Library/Homebrew/test/fixtures/receipt.json
    Library/Homebrew/test/fixtures/test.jpg
    Library/Homebrew/test/fixtures/test.png
    Library/Homebrew/test/fixtures/test.tiff
    Library/Homebrew/test/test_bottle_filename.rb
    Library/Homebrew/test/test_tab.rb
    Library/Homebrew/utils/popen.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
2014-08-20 17:24:49 -0400 /Package[findutils] (notice): Dependency Package[boxen/brews/gcc48] has failures: true
2014-08-20 17:24:49 -0400 /Package[findutils] (warning): Skipping because of failed dependencies
2014-08-20 17:24:49 -0400 /Package[ack] (notice): Dependency Package[boxen/brews/gcc48] has failures: true
2014-08-20 17:24:49 -0400 /Package[ack] (warning): Skipping because of failed dependencies
2014-08-20 17:24:49 -0400 /Package[gnu-tar] (notice): Dependency Package[boxen/brews/gcc48] has failures: true
2014-08-20 17:24:49 -0400 /Package[gnu-tar] (warning): Skipping because of failed dependencies
2014-08-20 17:24:49 -0400 /Stage[main]/Main/Node[default]/File[/Users/jaime/src/our-boxen] (notice): Dependency Package[boxen/brews/gcc48] has failures: true
2014-08-20 17:24:49 -0400 /Stage[main]/Main/Node[default]/File[/Users/jaime/src/our-boxen] (warning): Skipping because of failed dependencies
bunzli commented 10 years ago

Succeeded at version 8d2c1ee30041acbd297cca5f77162990166e07e2.