Skip to content

Instantly share code, notes, and snippets.

@dbolser

dbolser/gist:473835

Created July 13, 2010 13:17
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 dbolser/473835 to your computer and use it in GitHub Desktop.
Save dbolser/473835 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
[dbolser@nanna bioperl-live]$ git pull origin
remote: Counting objects: 49, done.
remote: Compressing objects: 100% (25/25), done.
remote: Total 25 (delta 19), reused 0 (delta 0)
Unpacking objects: 100% (25/25), done.
From git://github.com/bioperl/bioperl-live
0fe0648..cc09af2 master -> origin/master
Bio/DB/SeqFeature/Store/DBI/mysql.pm: needs update
error: Entry 'Bio/DB/SeqFeature/Store/DBI/mysql.pm' not uptodate. Cannot merge.
fatal: merging of trees 7d7a541ce7666e14b0b374b935295f9e45b1b46c and ad242f654a85bd850e6d508319c1adc15e88c27b failed
Merge with strategy recursive failed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment