Skip to content

Instantly share code, notes, and snippets.

@hayksaakian

hayksaakian/git console

Created February 16, 2014 21:18
Show Gist options
  • Save hayksaakian/9040767 to your computer and use it in GitHub Desktop.
Save hayksaakian/9040767 to your computer and use it in GitHub Desktop.
Download ZIP
learning rebase
Raw
git console
Hayk-Saakians-Mac:extempengine hayk$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: transitioning to mongoid 3
Using index info to reconstruct a base tree...
M Gemfile
M Gemfile.lock
<stdin>:18: trailing whitespace.
gem 'mongoid-locker' #
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Auto-merging Gemfile
Failed to merge in the changes.
Patch failed at 0001 transitioning to mongoid 3
The copy of the patch that failed is found in:
/Users/hayk/ror/extempengine/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment