[...]
First, rewinding head to replay your work on top of it...
Applying: Reporposed Editor Settings dialog as a Custom ToD dialog
Using index info to reconstruct a base tree...
<stdin>:423: trailing whitespace.

<stdin>:483: trailing whitespace.

warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging src/hotkeys.cpp
Auto-merging src/gui/dialogs/editor_settings.cpp
CONFLICT (content): Merge conflict in src/gui/dialogs/editor_settings.cpp
Auto-merging src/editor/editor_controller.hpp
Auto-merging src/editor/editor_controller.cpp
Auto-merging data/themes/editor.cfg
CONFLICT (content): Merge conflict in data/themes/editor.cfg
Auto-merging data/gui/default/window/editor_settings.cfg
Failed to merge in the changes.
Patch failed at 0001 Reporposed Editor Settings dialog as a Custom ToD dialog

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