Created
November 3, 2011 06:17
-
-
Save echristopherson/1335896 to your computer and use it in GitHub Desktop.
This file contains hidden or 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
0 [ ~ ] $ rvm get head | |
Original installed RVM version: | |
rvm 1.9.2 by Wayne E. Seguin ([email protected]) [https://rvm.beginrescueend.com/] | |
remote: Counting objects: 326, done. | |
remote: Compressing objects: 100% (266/266), done. | |
remote: Total 326 (delta 24), reused 177 (delta 19) | |
Receiving objects: 100% (326/326), 802.32 KiB | 128 KiB/s, done. | |
Resolving deltas: 100% (24/24), done. | |
From git://github.com/wayneeseguin/rvm | |
* branch master -> FETCH_HEAD | |
Already on 'master' | |
remote: Counting objects: 326, done. | |
remote: Compressing objects: 100% (266/266), done. | |
remote: Total 326 (delta 24), reused 177 (delta 19) | |
Receiving objects: 100% (326/326), 802.32 KiB | 128 KiB/s, done. | |
Resolving deltas: 100% (24/24), done. | |
From git://github.com/wayneeseguin/rvm | |
* branch master -> FETCH_HEAD | |
Auto-merging scripts/functions/build | |
CONFLICT (add/add): Merge conflict in scripts/functions/build | |
Auto-merging scripts/functions/env | |
CONFLICT (add/add): Merge conflict in scripts/functions/env | |
Auto-merging scripts/functions/environment | |
CONFLICT (add/add): Merge conflict in scripts/functions/environment | |
Auto-merging scripts/initialize | |
CONFLICT (add/add): Merge conflict in scripts/initialize | |
Auto-merging scripts/selector | |
CONFLICT (add/add): Merge conflict in scripts/selector | |
Automatic merge failed; fix conflicts and then commit the result. | |
ERROR: Could not update branch master. | |
RVM reloaded! | |
0 [ ~ ] $ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment