Katon Minhas
f8b8a580ff
fields/additional initializations * Set up test file * New fields + new field names * Add initial prompts to json * Column renaming - remove CONTRACT_ prefix * update tests * testing * Fix regex pattern in json.loads * Merge branch 'hotfix/file-errors' into refactor/new-field-names * add UNIT_OF_MEASURE * initialize new values * Add rate change interval * Merge branch 'main' into fields/additional-initializations * remove test * replace field names * update REIMB_ID * update date columns * update reimbursement effective dt * Revert adhoc scripts * Revert client files * Update postprocessing_funcs * revert regex_utils * Fix valid issue * UNIT_OF_MEASURE * REIMB_TERM * Revert postprocessing funcs tests 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.