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".