Skip to content

Instantly share code, notes, and snippets.

@RyanHirsch

RyanHirsch/rebaseWoes.txt

Last active December 19, 2015 19:39
Show Gist options
  • Save RyanHirsch/6007662 to your computer and use it in GitHub Desktop.
Save RyanHirsch/6007662 to your computer and use it in GitHub Desktop.
Download ZIP
Trying to rebase my local master with upstream/master
Raw
rebaseWoes.txt
(master)$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: Update _findData to convert IDs to strings when searching. Addresses issue 109
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging dist/ember-model.prod.js
CONFLICT (content): Merge conflict in dist/ember-model.prod.js
Auto-merging dist/ember-model.min.js
CONFLICT (content): Merge conflict in dist/ember-model.min.js
Auto-merging dist/ember-model.js
Failed to merge in the changes.
Patch failed at 0001 Update _findData to convert IDs to strings when searching. Addresses issue 109
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
@meilinger
Copy link

Run "git mergetool" (need to have a merge tool setup) to resolve the conflicts. After that, you should be able to continue the rebase.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment