gistfile1.txt

~/Projects $git pull --rebase
remote: Counting objects: 60, done
remote: Finding sources: 100% (41/41)
remote: Getting sizes: 100% (23/23)
remote: Compressing objects: 100% (4/4)
remote: Total 41 (delta 29), reused 38 (delta 29)
Unpacking objects: 100% (41/41), done.
From https://devtools:8443/git/iOS
   e71b698..8c51472  master     -> origin/master
First, rewinding head to replay your work on top of it...
Applying: Sign should be a local signer
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
	DSComposeViewController.m
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Sign should be a local signer

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

~/Projects $git status
# Not currently on any branch.
nothing to commit (working directory clean)
~/Projects $git rebase --abort
~/Projects $git pull --rebase
First, rewinding head to replay your work on top of it...
Applying: Sign should be a local signer
~/Projects $