<table><tr><td style="">ngraham added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D18179">View Revision</a></tr></table><br /><div><div><p>This patch no longer applies cleanly to master:</p>

<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">Switched to branch 'master'
Your branch is up to date with 'origin/master'.
Already up to date.
Deleted branch arcpatch-D18179 (was 8bf1a9117).
 INFO  Base commit is not in local repository; trying to fetch.
Created and checked out branch arcpatch-D18179.
Created and checked out branch arcpatch-D10974.
Checking patch part.cpp...
Checking patch interfaces/printinterface.h...
Checking patch generators/poppler/generator_pdf.h...
Checking patch generators/poppler/generator_pdf.cpp...
Checking patch core/printoptionswidget.h...
Checking patch core/printoptionswidget.cpp...
Checking patch core/fileprinter.cpp...
Checking patch core/document.h...
Checking patch CMakeLists.txt...
Applied patch part.cpp cleanly.
Applied patch interfaces/printinterface.h cleanly.
Applied patch generators/poppler/generator_pdf.h cleanly.
Applied patch generators/poppler/generator_pdf.cpp cleanly.
Applied patch core/printoptionswidget.h cleanly.
Applied patch core/printoptionswidget.cpp cleanly.
Applied patch core/fileprinter.cpp cleanly.
Applied patch core/document.h cleanly.
Applied patch CMakeLists.txt cleanly.

 Cherry Pick Failed!
 Exception 
Command failed with error #1!
COMMAND
git cherry-pick 'arcpatch-D10974'

STDOUT
On branch arcpatch-D18179
You are currently cherry-picking commit 4cc9a85f0.

nothing to commit, working tree clean


STDERR
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git reset'

(Run with `--trace` for a full exception trace.)</pre></div>

<p>Could you rebase on master?</p></div></div><br /><div><strong>REPOSITORY</strong><div><div>R223 Okular</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D18179">https://phabricator.kde.org/D18179</a></div></div><br /><div><strong>To: </strong>michaelweghorn, Okular, ngraham, sander<br /><strong>Cc: </strong>aacid, fvogt, okular-devel, joaonetto, tfella, ngraham, darcyshen<br /></div>