ndavis added a comment.
In D16951#363879 <https://phabricator.kde.org/D16951#363879>, @nicolasfella wrote: > In D16951#363878 <https://phabricator.kde.org/D16951#363878>, @ndavis wrote: > > > 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`). > > > Saved in the program you resolved the conflict with > > > 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> > > git thinks everything is ok, but the merge conflict markers are still in the file. > > I think you should restore the unmerged version, merge again, resolve the conflict and upload it again How do I do this? 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
