Skip to content

Instantly share code, notes, and snippets.

@benheb

benheb/gist:2789326

Created May 25, 2012 17:25
Show Gist options
  • Save benheb/2789326 to your computer and use it in GitHub Desktop.
Save benheb/2789326 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
benheb@benheb:~/geocommons/geoiq$ git pull origin 9323_twitch_maps
remote: Counting objects: 46, done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 29 (delta 23), reused 22 (delta 16)
Unpacking objects: 100% (29/29), done.
From github.com:geoiq/geoiq
* branch 9323_twitch_maps -> FETCH_HEAD
Updating a64f413..cf1ce42
error: The following untracked working tree files would be overwritten by merge:
tiles/ModestMaps/MapQuest.py
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