Katon Minhas
baf5002b2c
Feature/exhibit linking * Initialize new exhibit header prompt * Save * Merge branch 'main' into feature/exhibit-linking * update prompt * cleanup return type * remove test * Test fixes * Fix test * Add tests * Merge branch 'main' into feature/exhibit-linking * Merge branch 'main' into feature/exhibit-linking * Remove test notebooks * Delete test notebook * Save * Merge branch 'main' into feature/exhibit-linking * try except for exhbit page finding * Prep for merge * update test * Remove test * Merge branch 'main' into feature/exhibit-linking * update unit test * Fix unit test * replace try except * Update page sort * Add docstring Approved-by: Alex Galarce
Branching and Release Management Guide
Overview
This guide outlines the naming conventions, branching strategy, and merging process for our Git repository.
Branch Naming Conventions
- Feature Branch:
feature/<name>- Example:
feature/add_build_stage
- Example:
- Bugfix Branch:
bugfix/<name>- Example:
bugfix/pages_duplication
- Example:
- Hotfix Branch:
hotfix/<name>- Example:
hotfix/deployment_failure
- Example:
....
Branching Strategy
Creating Branches
- Create a feature branch from
mainusing the appropriate naming convention. - Create a small and complete change.
mainmust always have deployable code. - Create a Pull Request back to
main. - Ensure all checks have passed.
- Merge new code.
- Ensure the functionality is verified in the dev environment.
Refer to the branching guide in Confluence for more info on this
This guide ensures that all team members follow the best practices for branch management and releases.