Skip to content

Instantly share code, notes, and snippets.

@nurey
Created November 4, 2011 14:14
Show Gist options
  • Save nurey/1339408 to your computer and use it in GitHub Desktop.
Save nurey/1339408 to your computer and use it in GitHub Desktop.
$ rvm get head
Original installed RVM version:
rvm 1.9.2 by Wayne E. Seguin ([email protected]) [https://rvm.beginrescueend.com/]
remote: Counting objects: 328, done.
remote: Compressing objects: 100% (269/269), done.
remote: Total 328 (delta 26), reused 175 (delta 18)
Receiving objects: 100% (328/328), 804.78 KiB | 760 KiB/s, done.
Resolving deltas: 100% (26/26), done.
From git://github.com/wayneeseguin/rvm
* branch master -> FETCH_HEAD
Already on 'master'
Your branch is ahead of 'origin/master' by 1050 commits.
remote: Counting objects: 328, done.
remote: Compressing objects: 100% (269/269), done.
remote: Total 328 (delta 26), reused 175 (delta 18)
Receiving objects: 100% (328/328), 804.78 KiB | 1.32 MiB/s, done.
Resolving deltas: 100% (26/26), done.
From git://github.com/wayneeseguin/rvm
* branch master -> FETCH_HEAD
Auto-merging scripts/get
CONFLICT (add/add): Merge conflict in scripts/get
Auto-merging scripts/gemsets
CONFLICT (add/add): Merge conflict in scripts/gemsets
Auto-merging scripts/functions/utility
CONFLICT (add/add): Merge conflict in scripts/functions/utility
Auto-merging scripts/functions/pkg
CONFLICT (add/add): Merge conflict in scripts/functions/pkg
Auto-merging scripts/functions/environment
CONFLICT (add/add): Merge conflict in scripts/functions/environment
Auto-merging scripts/functions/build
CONFLICT (add/add): Merge conflict in scripts/functions/build
Auto-merging scripts/cli
CONFLICT (add/add): Merge conflict in scripts/cli
Automatic merge failed; fix conflicts and then commit the result.
ERROR: Could not update branch master.
RVM reloaded!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment