ngraham added a comment.
you need to rebase on top of `master` from the remote. This looks to have been branched off of the state of master from last November or something. Try `git pull --rebase origin master` That should give you some merge conflicts that you can fix. REPOSITORY R116 Plasma Network Management Applet REVISION DETAIL https://phabricator.kde.org/D27823 To: niccolove, jgrulich, #vdg, ngraham Cc: ngraham, plasma-devel, Orage, LeGast00n, The-Feren-OS-Dev, cblack, jraleigh, zachus, fbampaloukas, GB_2, ragreen, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, ahiemstra, mart
