Skip to content

Instantly share code, notes, and snippets.

@anteaya

anteaya/gist:5237299

Created March 25, 2013 13:59
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save anteaya/5237299 to your computer and use it in GitHub Desktop.
Save anteaya/5237299 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: Added PyRSS2Gen and python-swiftclient to pip-requires to satisfy the openstackwatch dependency.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging tools/pip-requires
CONFLICT (content): Merge conflict in tools/pip-requires
Failed to merge in the changes.
Patch failed at 0001 Added PyRSS2Gen and python-swiftclient to pip-requires to satisfy the openstackwatch dependency.
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".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment