flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Harui <aha...@adobe.com>
Subject Re: Merging 4.9.1 release bench into develop
Date Tue, 16 Apr 2013 06:36:07 GMT

>> What was the change to Version.as in the develop branch that conflicted?
> Yep.
That wasn't a "yep" question.  But I think I know the answer: we updated the
Version.as in the develop branch.  Do we need to do that?  I think I saw in
the git branching model that they change the version in the release branch
after creating it (which implies the don't change it in the develop branch).
Then it won't conflict on merge.

Alex Harui
Flex SDK Team
Adobe Systems, Inc.

View raw message