Skip to content

Instantly share code, notes, and snippets.

@dennisschaaf

dennisschaaf/gist:181184

Created September 4, 2009 22:11
Show Gist options
  • Save dennisschaaf/181184 to your computer and use it in GitHub Desktop.
Save dennisschaaf/181184 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
C:\Documents and Settings\Owner\My Documents\Workspaces\museum>git pull
remote: Counting objects: 30, done.
remote: Compressing objects: 100% (16/16), done.
remote: Total 17 (delta 8), reused 0 (delta 0)
Unpacking objects: 100% (17/17), done.
From git@github.com:speedlimits/museum
0f8441c..b702652 ccrma_master -> origin/ccrma_master
error: Entry 'build/cmake/camera_path.csv' not uptodate. Cannot merge.
fatal: merging of trees 0d80a0ddf19d106a90a52859ca42772cf304c1b4 and 7391b16a364
d43f75e88300d811cf5c7ce645526 failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment