On 9/5/13 3:23 AM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote:

>After running sdk/ant, git status report only " flex-sdk-description.xml"
>as
>modified file, that's 5 months or so I didn't have a look in the SDK,
>could
>you tell me what should be done in order the build number be created only
>on
>the release build envisioning what impact it could introduce ?
IMO, we just have to decide that's what we want to do.

Note that the Git Branching Model does show release branches merged back
to develop.  It mentions that there is often a merge conflict with the
version number file but doesn't explicitly say what to do about it.  We
can try leaving the version number unchanged at 0 in the develop branch
and after a release branch merge changes it, set it back to 0.

-Alex

Reply via email to