nicolasfella added a comment.
This assumes the files that you uploaded before the merge are all correct. - Save the correct icons somewhere. - Checkout the old diff: arc patch --diff 45755 - Begin rebase: git rebase master - Override the files with conflicts with the files you saved - git add files - git rebase --continue - Upload it: arc diff REPOSITORY R266 Breeze Icons REVISION DETAIL https://phabricator.kde.org/D16951 To: ndavis, #vdg, ngraham, nicolasfella, #kde_connect Cc: cfeck, trickyricky26, abetts, ngraham, rizzitello, nicolasfella, kde-frameworks-devel, michaelh, bruns
