Created
July 13, 2010 13:12
-
-
Save dbolser/473823 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [dbolser@nanna bioperl-live]$ git remote -v | |
| dbolser [email protected]:dbolser/bioperl-live.git | |
| origin git://github.com/bioperl/bioperl-live.git | |
| [dbolser@nanna bioperl-live]$ git push dbolser | |
| To [email protected]:dbolser/bioperl-live.git | |
| ! [rejected] master -> master (non-fast forward) | |
| error: failed to push some refs to '[email protected]:dbolser/bioperl-live.git' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
[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.
[dbolser@nanna bioperl-live]$