Katon Minhas
a3df2f3e15
Feature/remove nte * Revert prompts * Remove qa_qc tests * Remove valid lines * Update crosswalk path * remove extra argument from split compound reimbursement * model aliasing * Haiku alias * remove erroneous import * Merge branch 'refactor/update-claude-models' into bugfix/aug-5-issue-fixes * Convert all matching codes to strings * Exit if service is empty * Merged main into bugfix/aug-5-issue-fixes * global lesser of fix * Merge branch 'main' into feature/remove-nte * Remove NTE 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.