gistfile1.txt

% git rebase master
First, rewinding head to replay your work on top of it...
Applying: Add CongrexEsrs target
Applying: Show search view for events
Using index info to reconstruct a base tree...
<stdin>:29: trailing whitespace.
        
<stdin>:50: trailing whitespace.
    
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
	Classes/EventsTableViewController.m
	Resources/CongrexEccmid/ui.plist
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0002 Show search view for events

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

1 dwt@cirdan ~/Code/Projekte/Inside/InsideMobile (git)-[next|rebase] 
% git status
# Not currently on any branch.
nothing to commit (working directory clean)
dwt@cirdan ~/Code/Projekte/Inside/InsideMobile (git)-[next|rebase] 
%                                                                                                                                                              

dwt@cirdan ~/Code/Projekte/Inside/InsideMobile (git)-[next|rebase]
% git rebase --abort
HEAD is now at 3ff5610 Enable global event search.
dwt@cirdan ~/Code/Projekte/Inside/InsideMobile (git)-[next]
% git status

On branch next

nothing to commit (working directory clean)
dwt@cirdan ~/Code/Projekte/Inside/InsideMobile (git)-[next]
%