Hi, I think we may need to be more careful about branches and commits in the future. I saw a fair number of merge conflicts for the RM to have to resolve to merge the release branch back into develop. The use of cherry-picking may be part of the problem. I wrote down my thoughts on the subject in the wiki https://github.com/apache/royale-asjs/wiki/Branch-Management
Now it is true that in the future, the release branches may not live as long so there will be fewer conflicts, but if we are successful and become a more active community, we will want to have good practices around this so that the develop branch can handle less stable commits while were getting a release out. My takeaway is that cherry-picking is not a best practice http://www.draconianoverlord.com/2013/09/07/no-cherry-picking.html because the changes in each branch are not correlated. Let's discuss, -Alex
