Skip to content

Instantly share code, notes, and snippets.

@rjeschmi

rjeschmi/gist:90e88244c5a61be54299

Created September 19, 2014 14:04
Show Gist options
  • Save rjeschmi/90e88244c5a61be54299 to your computer and use it in GitHub Desktop.
Save rjeschmi/90e88244c5a61be54299 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
OHRI-178319:www-bioinfo rob$ git pull origin master
remote: Counting objects: 8, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 8 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (8/8), done.
From gitlab.com:ohri/www-bioinfo
* branch master -> FETCH_HEAD
* [new branch] master -> origin/master
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
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