Skip to content

Instantly share code, notes, and snippets.

@offby1

offby1/*shell*.txt

Created April 27, 2012 17:18
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
Star You must be signed in to star a gist
Save offby1/2510964 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
*shell*.txt
$ git pull
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 2 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (2/2), done.
From /tmp/x/up
15c9e12..1213b44 master -> origin/master
Updating 15c9e12..1213b44
error: The following untracked working tree files would be overwritten by merge:
fluff
Please move or remove them before you can merge.
Aborting
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment