ndavis added a comment.
In D16951#363876 <https://phabricator.kde.org/D16951#363876>, @nicolasfella wrote: > In D16951#363875 <https://phabricator.kde.org/D16951#363875>, @ndavis wrote: > > > I thought I did this already. I rebased onto master, then added the version of the file I wanted, then continued the rebase, then updated the diff. Is there something I missed? > > > Sounds reasonable. Maybe you forgot to save, or forgot to add a file or added the wrong file. Save what or how? Doesn't `arc diff --update D16951` save things? I know I added the right files and there were only 2 conflicts (`icons/actions/16/dialog-input-devices.svg` and `icons-dark/actions/16/dialog-input-devices.svg`). I just pulled the patch with `arc patch D16951` If I do `git status`, it says On branch arcpatch-D16951 nothing to commit, working tree clean This is what Git looks like in `git-dag`: F6435866: Screenshot_20181121_180633.png <https://phabricator.kde.org/F6435866> 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
