Mayank Aamseek
3027d8e1d5
Bugfix/mi reimb terms * test changes * logging added * Merge branch 'main' into bugfix/generic-reimb-terms * parsing fixes * fix missing reimbursements * make service terms unique by adding additional context * Merge branch 'main' into bugfix/mi-reimb-terms * remomoving test changes * remomoving test changes * remomoving test changes * test case for universal_json_load added Approved-by: Katon Minhas
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.