Created
February 27, 2012 19:50
-
-
Save scottcain/1926596 to your computer and use it in GitHub Desktop.
pull wont work
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
| M bin/gbrowse_attach_slaves.pl | |
| U cgi-bin/admin | |
| M cgi-bin/attach.pl | |
| U cgi-bin/slaveStatus.pl | |
| M cgi-bin/slaves.pl | |
| M cgi-bin/volumeStatus.pl | |
| A lib/Bio/Graphics/Browser2/Cloud/Userdata.pm | |
| Pull is not possible because you have unmerged files. | |
| Please, fix them up in the work tree, and then use 'git add/rm <file>' | |
| as appropriate to mark resolution, or use 'git commit -a'. | |
| diff --cc cgi-bin/admin | |
| index 2be8228,2352585..0000000 | |
| --- a/cgi-bin/admin | |
| +++ b/cgi-bin/admin | |
| diff --cc cgi-bin/slaveStatus.pl | |
| index e91246d,cf41464..0000000 | |
| --- a/cgi-bin/slaveStatus.pl | |
| +++ b/cgi-bin/slaveStatus.pl |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment