Skip to content

Instantly share code, notes, and snippets.

@ieure

ieure/gist:7777474

Created December 3, 2013 21:08
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ieure/7777474 to your computer and use it in GitHub Desktop.
Save ieure/7777474 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
fermion!ieure:~$ brew update
error: The following untracked working tree files would be overwritten by merge:
Library/Formula/ant.rb
Library/Formula/apple-gcc42.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
fermion!ieure:~$ cd /usr/local/
fermion!ieure:/usr/local$ git status
# On branch master
nothing to commit, working directory clean
fermion!ieure:/usr/local$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment