marco@marco-laptop:/static/wine$ git rebase origin
First, rewinding head to replay your work on top of it...
HEAD is now at 9741751... widl: Remove some confusion in how version numbers are packed into an attribute by defining some macros for this purpose.
Applying added de_DE.UTF-8 translated Wine man page
Adds trailing whitespace.
.dotest/patch:26:
Adds trailing whitespace.
.dotest/patch:93:leitet die Umgebungsvariablen der Shell, in der es gestartet wurde, an die Windows-Applikation weiter. Um eine für Ihre Applikation nötige Variable zugänglich zu machen, folgen Sie der Anleitung Ihrer Shell zu Umgebungsvariablen.
Adds trailing whitespace.
.dotest/patch:94:.TP
Adds trailing whitespace.
.dotest/patch:139:oder
Adds trailing whitespace.
.dotest/patch:140:.B trace.
error: patch failed: loader/Makefile.in:32
error: loader/Makefile.in: patch does not apply
Using index info to reconstruct a base tree...
Adds trailing whitespace.
<stdin>:26:
Adds trailing whitespace.
<stdin>:93:leitet die Umgebungsvariablen der Shell, in der es gestartet wurde, an die Windows-Applikation weiter. Um eine für Ihre Applikation nötige Variable zugänglich zu machen, folgen Sie der Anleitung Ihrer Shell zu Umgebungsvariablen.
Adds trailing whitespace.
<stdin>:94:.TP
Adds trailing whitespace.
<stdin>:139:oder
Adds trailing whitespace.
<stdin>:140:.B trace.
warning: squelched 14 whitespace errors
warning: 19 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merged loader/Makefile.in
CONFLICT (content): Merge conflict in loader/Makefile.in
Failed to merge in the changes.
Patch failed at 0001.
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".
marco@marco-laptop:/static/wine$