Alex Galarce
54910a7459
Hotfix/flatten list to string * updated * rate fields fix * updated the singleton_list * updated * added * Checked_files * added * Merged main into hotfix/flatten-list-to-string * format_rate_fields_with_commas * Update test * flatten_singleton_string_list - new cases * Update * Removed unneccessary case * Remove case * Updated the test cases * Merge remote-tracking branch 'origin/main' into hotfix/flatten-list-to-string * Refactor flatten_singleton_string_list to handle empty input and return a comma-separated string for multiple elements 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.