Skip to content

Instantly share code, notes, and snippets.

@lloyd

lloyd/gist:204152

Created October 7, 2009 15:49
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 lloyd/204152 to your computer and use it in GitHub Desktop.
Save lloyd/204152 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
[lth@lappro bp-docdb] $ git pull git://github.com/vargon/bp-docdb.git
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From git://github.com/vargon/bp-docdb
* branch HEAD -> FETCH_HEAD
Auto-merging BuildConfigs.cmake
CONFLICT (add/add): Merge conflict in BuildConfigs.cmake
Auto-merging manifest.json
CONFLICT (add/add): Merge conflict in manifest.json
Automatic merge failed; fix conflicts and then commit the result.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment