Skip to content

Instantly share code, notes, and snippets.

@remear

remear/gist:1236422

Created September 23, 2011 00:10
Show Gist options
  • Save remear/1236422 to your computer and use it in GitHub Desktop.
Save remear/1236422 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
$ rake osx:deps:install
git fetch shoes
git merge shoes/shoes
fatal: 'merge' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
rake aborted!
Command failed with status (128): [git merge shoes/shoes...]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment