wayneeseguin/rvm — Issue #587: rvm get head merge conflict
Author: thegrubbsian
Created: 2011-11-09 16:04:22+00:00
State: open

Getting the following when I attempt to run "rvm get head".

rvm 1.9.2 by Wayne E. Seguin (wayneeseguin@gmail.com) [https://rvm.beginrescueend.com/]

remote: Counting objects: 326, done.
remote: Compressing objects: 100% (266/266), done.
remote: Total 326 (delta 24), reused 216 (delta 19)
Receiving objects: 100% (326/326), 811.26 KiB, done.
Resolving deltas: 100% (24/24), done.
From git://github.com/wayneeseguin/rvm
* branch master -> FETCH_HEAD
Already on 'master'
Your branch is ahead of 'origin/master' by 523 commits.
remote: Counting objects: 326, done.
remote: Compressing objects: 100% (266/266), done.
remote: Total 326 (delta 24), reused 216 (delta 19)
Receiving objects: 100% (326/326), 811.26 KiB, done.
Resolving deltas: 100% (24/24), done.
From git://github.com/wayneeseguin/rvm
* branch master -> FETCH_HEAD
Auto-merging examples/rvmrc
CONFLICT (add/add): Merge conflict in examples/rvmrc
Auto-merging help/gemset
CONFLICT (add/add): Merge conflict in help/gemset
Auto-merging help/get
CONFLICT (add/add): Merge conflict in help/get
Auto-merging hooks/after_cd
CONFLICT (add/add): Merge conflict in hooks/after_cd
Auto-merging hooks/after_use
CONFLICT (add/add): Merge conflict in hooks/after_use
Auto-merging scripts/cd
CONFLICT (add/add): Merge conflict in scripts/cd
Auto-merging scripts/cli
CONFLICT (add/add): Merge conflict in scripts/cli
Auto-merging scripts/disk-usage
CONFLICT (add/add): Merge conflict in scripts/disk-usage
Auto-merging scripts/functions/build
CONFLICT (add/add): Merge conflict in scripts/functions/build
Auto-merging scripts/functions/environment
CONFLICT (add/add): Merge conflict in scripts/functions/environment
Auto-merging scripts/functions/installer
CONFLICT (add/add): Merge conflict in scripts/functions/installer
Auto-merging scripts/functions/pkg
CONFLICT (add/add): Merge conflict in scripts/functions/pkg
Auto-merging scripts/functions/rvmrc
CONFLICT (add/add): Merge conflict in scripts/functions/rvmrc
Auto-merging scripts/functions/utility
CONFLICT (add/add): Merge conflict in scripts/functions/utility
Auto-merging scripts/gemsets
CONFLICT (add/add): Merge conflict in scripts/gemsets
Auto-merging scripts/get
CONFLICT (add/add): Merge conflict in scripts/get
Auto-merging scripts/notes
CONFLICT (add/add): Merge conflict in scripts/notes
Auto-merging scripts/requirements
CONFLICT (add/add): Merge conflict in scripts/requirements
Auto-merging scripts/tools
CONFLICT (add/add): Merge conflict in scripts/tools
Automatic merge failed; fix conflicts and then commit the result.
ERROR: Could not update branch master.
RVM reloaded!