If you make a change in Plasma/5.0 that should also be in master, could you merge the branches soon after committing. It's a lot harder if someone has to deal with 10 changes and conflicts at once and has to look up what each change is.
Thanks David _______________________________________________ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
