ngraham added a comment.
What you need to do is rebase the branch for your patch on current master: `git pull --rebase origin master` Then fix up the merge conflicts. Then run `arc diff` again. REPOSITORY R120 Plasma Workspace REVISION DETAIL https://phabricator.kde.org/D19745 To: ratijastk, #vdg, #plasma, broulik, mart, hein Cc: ngraham, ndavis, anthonyfieroni, plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
