It'd be better for any 1.3 changes/bug fixes to be committed directly to 1.3-rel, and then 1.3-rel should be merged regularly into master to pick those changes up for the future. I'd suggest any pending changes on master that should be in 1.3 be abandoned and resubmitted to 1.3-rel. All the cherry-picking that happened between 1.2-rel and master did not work well at all.
-----Original Message----- From: iotivity-dev-bounces at lists.iotivity.org [mailto:[email protected]] On Behalf Of Mats Wichmann Sent: Monday, April 10, 2017 1:50 PM To: ??? (Uze Choi) <uzchoi at samsung.com>; iotivity-dev at lists.iotivity.org Subject: Re: [dev] 1.3-rel Branch out/QA start request. On 04/10/2017 04:57 AM, ??? (Uze Choi) wrote: > Hi All, > > > > 1.3-rel branch has been created. 1.3.0 Release period just started. > > There are approximately 70 change sets waiting merge on the master > branches > > Except this patches, All code merge should have the release management Lead > review +1 on the release branch. So for owners of waiting changesets... how do we proceed? The small number I have in the queue (five public) I would not consider release-critical, but also letting master and 1.3-rel diverge is not wonderful, makes lots of work later for someone - I'm remembering what Phil and others had to do to get master back in sync with 1.2-rel. Advice please? _______________________________________________ iotivity-dev mailing list iotivity-dev at lists.iotivity.org https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.iotivity.org%2Fmailman%2Flistinfo%2Fiotivity-dev&data=02%7C01%7Ckkane%40microsoft.com%7C3a7057b259e34a700d8608d4805326b6%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C636274542026472282&sdata=kaW7CiPhNlVkyehkZTEnFkQMMNTJXNXUHlkjKaXuMWQ%3D&reserved=0
