remember to merge Plasma/5.8 into Plasma/5.9 and master

[Eike Hein]

On 01/16/2017 09:40 PM, Marco Martin wrote:
> On Monday 16 January 2017 12:25:33 Jonathan Riddell wrote:
>> At the meeting today we discussed merging.  Please remember to merge fixes
>> in Plasma/5.8 into Plasma/5.9 branches and into master.
>>
>> I've now scheduled in doing this the day before 5.9.x releases but obviously
>> it's much less error prone if you do it when you first commit.
> 
> and just extra reminder, pay special attention to places where the code is 
> changed a lot since 5.8, so thinking about twice what applies to 5.8 and what 
> don't (easy example, global menu support, probably more subtle edge cases 
> around)

And for a bonus third round of reminders, this is easier if you
merge:
5.8 into 5.9
and then
5.9 into master
... instead of merging 5.8 into both 5.9 and master.


Cheers,
Eike