incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Harui <aha...@adobe.com>
Subject Re: Draft release notes for Apache Flex 4.9
Date Thu, 06 Dec 2012 20:07:49 GMT



On 12/6/12 10:58 AM, "Carol Frampton" <cframpto@adobe.com> wrote:

> 
> 
> On 12/6/12 12 :53PM, "Justin Mclean" <justin@classsoftware.com> wrote:
> 
>> Hi,
>> 
>>> IMO, not too late to check in the pending fixes.
>> 
>> Yep agree. Just need to decide if you check into the release branch (and
>> we merge back into the develop later) OR provide patch files to apply to
>> the release branch.
> 
> I would check into the develop branch and merge to the release branch.
> 
You can do that for now since the two branches do not have skew, but once
there is, it is too easy to accidentally bring over unintended code from
develop to release.  In the same way we would rarely merge from trunk to
branches, we should rarely merge from develop to its branches.

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui


Mime
View raw message