framework | The * new * framework repository

Since all the apps will share one repository, it is crucial that developers employ good Git practices.The Git workflow that this project will adhere to (more or less) is called Git Flow. A longer explanation of it (with charts!) is available here. The basic summary with respect to the Phoenix/Version 2 branches is: The phoenix/develop branch is for merging feature branches and applying fixes. It may not always be stable, but should aim for "Beta" quality stability. Significant new development should never occur directly in the phoenix/develop branch. Development on individual apps, features, or parts of the repository should take place in a branch of phoenix/develop named phoenix/feature/[app] (or phoenix/feature/[app]_[description]). These branches are unprotected and can be modified by anyone with "Developer" access to the repository. Once a feature/ branch is working, a pull request (aka "merge request") can be made to merge it back into the phoenix/develop branch. Since the phoenix/* branches are meant for the development of a large-scale update to the Framework codebase and apps, there is no phoenix/master branch. When ready for release, the phoenix/develop code will be merged into the mainline (develop and master) branches of the repository.If multiple developers are working on a single app, it is important to coordinate to ensure that they are working in different sub-branches and that their changes may be merged with one another cleanly.Only people with "Master" repository access will be able merge/push to the phoenix/develop branch. They will handle merging in updates from the app branches.