>> 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. http://blogs.adobe.com/aharui
- Merging 4.9.1 release bench into develop Justin Mclean
- Re: Merging 4.9.1 release bench into develop Alex Harui
- Re: Merging 4.9.1 release bench into develop Justin Mclean
- Re: Merging 4.9.1 release bench into develop Alex Harui
- Re: Merging 4.9.1 release bench into develo... Justin Mclean
- Re: Merging 4.9.1 release bench into develop Justin Mclean
- Re: Merging 4.9.1 release bench into develop Justin Mclean
