Git Flow ######## NearBeach uses Git flow for it's development cycle. Learning Resources: * `Github Documentation of Git Flow `_ * `Atlassian Documentation of Git Flow `_ * `Git Flow cheat sheet by Daniel Kummer `_ Branch Names: +--------------------+--------------------------+ | Git Default Branch | Branch Name In NearBeach | +--------------------+--------------------------+ | Master/Main | main | +--------------------+--------------------------+ | Develop | develop | | | | +--------------------+--------------------------+ | Feature | feature | +--------------------+--------------------------+ | Release | release | +--------------------+--------------------------+ | Hotfix | hotfix | +--------------------+--------------------------+ Notes: * Any new features, should have the feature created from the `develop` branch * Any new hotfixes, should have the hotfix created from the `main` branch * Any new releases, will automatically trigger the github actions, and preform a release * If releasing new code, the release should be created from the `develop` branch * If releasing separate from development, i.e. deploying same code base with updated libraries, then follow the deployment instructions.