Appendix L: Git Branching Strategy - ApertureViewer/Aperture-Opertations-Manual GitHub Wiki

Branching Strategy (Git)

• dev: Main development branch for Aperture Viewer. All new features and fixes are integrated here first. This is the primary branch to branch from for Aperture-specific work and to merge into. Sync with origin/dev.
• master: Represents the pristine, unmodified master (or main development line) of the upstream Firestorm Viewer. Used exclusively for fetching upstream updates and as a base for creating PRFS/* branches. NEVER COMMIT DIRECTLY TO THIS BRANCH.
• release (or release/vX.Y.Z): Release preparation branch. Created from dev when dev is deemed stable and ready for a release. Only critical bug fixes specific to the release are merged here. Used for tagging official releases (e.g., v1.0.0).
• feature/[descriptive-name]: For developing new Aperture-specific features or significant enhancements. Branched from dev.
• fix/[issue-number-or-description]: For fixing bugs reported in Aperture. Branched from dev.
• hotfix/[descriptive-name]: For urgent fixes to dev or a release branch. Branched from dev or the relevant release branch.
• backup/[date-or-description]: Temporary backup branches, usually of dev, before major operations. Not for active development.