ngraham added a comment.
Hmm, so what's our path forward here? What's the best way to merge this while preserving some semblance of history and state? REPOSITORY R98 Breeze for Gtk BRANCH breeze-gtk-sass (branched from master) REVISION DETAIL https://phabricator.kde.org/D17154 To: gepardo, #plasma, jackg, #breeze, #vdg, ngraham, dirrukd, davidedmundson Cc: bshah, cgiboudeaux, davidedmundson, bcooksley, ngraham, jackg, plasma-devel, kvanton, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart