git reset --hard HEAD ; git pull --rebase origin 2.0.0pre

git reset --hard HEAD ; git pull --rebase origin 2.0.0pre

(14:38) user:~/dev/rubinius(master)$ git reset --hard HEAD ; git pull --rebase origin 2.0.0pre
HEAD is now at 9175c06 Merge pull request #1014 from apotheon/master
remote: Counting objects: 8015, done.
remote: Compressing objects: 100% (3301/3301), done.
remote: Total 7234 (delta 4511), reused 6178 (delta 3695)
Receiving objects: 100% (7234/7234), 3.40 MiB | 51 KiB/s, done.
Resolving deltas: 100% (4511/4511), completed with 320 local objects.
From git://github.com/rubinius/rubinius
 * branch            2.0.0pre   -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Updated spanish translation to the How-To Write Documentation page
Applying: Fixed speling of library.
Applying: fixed navigation in EN docs
Applying: regen site
Applying: PL bytecode compiler docs
Applying: regen the site
Applying: Properly detect the current git hash
Applying: Fixing README to point to Rubinius organization repository and GitHub issue tracker instead of @evanphx's repository.
Applying: Change only the appropriate references to point from evanphx to rubinius for the Rubinius project and issues
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Renaming lib/ext/melbourne/visitor.cpp => lib/ext/melbourne/visitor18.cpp
Auto-merging lib/ext/melbourne/visitor18.cpp
Auto-merging Rakefile
Auto-merging vm/drivers/cli.cpp
CONFLICT (content): Merge conflict in vm/drivers/cli.cpp
Failed to merge in the changes.
Patch failed at 0009 Change only the appropriate references to point from evanphx to rubinius for the Rubinius project and issues

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".