git rebase with whitespace errors

> git rebase --whitespace=nowarn master
First, rewinding head to replay your work on top of it...
Applying: Neue Log Methoden mit Parameter messageId, Methoden ohne diesen Parameter sind nun obsolete um anhand der Warn
ings die naechsten Aenderungen durchzufuehren
Using index info to reconstruct a base tree...
<stdin>:19: trailing whitespace.
                None  = 0,
<stdin>:23: trailing whitespace.
                Info  = 2,
<stdin>:24: trailing whitespace.
                Warn  = 3,
<stdin>:32: trailing whitespace.
                [Obsolete("Please use an override that accepts a message id instead.")]
<stdin>:39: trailing whitespace.
                [Obsolete("Please use an override that accepts a message id instead.")]
warning: squelched 167 whitespace errors
warning: 172 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging Source/Framework.Interfaces/Logging/ILogger.cs
CONFLICT (content): Merge conflict in Source/Framework.Interfaces/Logging/ILogger.cs
Auto-merging Source/Framework/Logging/AbstractLogger.cs
CONFLICT (content): Merge conflict in Source/Framework/Logging/AbstractLogger.cs
Auto-merging Source/Framework/Logging/CombinedLogger.cs
CONFLICT (content): Merge conflict in Source/Framework/Logging/CombinedLogger.cs
Auto-merging Source/Framework/Logging/EFlowLogger.cs
CONFLICT (content): Merge conflict in Source/Framework/Logging/EFlowLogger.cs
Auto-merging Source/Framework/Logging/EventLogger.cs
CONFLICT (content): Merge conflict in Source/Framework/Logging/EventLogger.cs
Auto-merging Source/Framework/Logging/Log4NetLogger.cs
CONFLICT (content): Merge conflict in Source/Framework/Logging/Log4NetLogger.cs
Failed to merge in the changes.
Patch failed at 0001 Neue Log Methoden mit Parameter messageId, Methoden ohne diesen Parameter sind nun obsolete um anha
nd der Warnings die naechsten Aenderungen durchzufuehren

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