Alex Galarce
001c2e45b5
plan state hotfix * updated state_check function * added a wrapper function apply_state_check_to_df function to enable state_check function to work with dataframe and also wrote unit tests for both the functions. * Merged main into hotfix/plan_state * append extra column with new health plan state corrected * Merge remote-tracking branch 'refs/remotes/origin/hotfix/plan_state' into hotfix/plan_state * fix tests * move apply_state_check_to_df() to cnc_hotfix.py * move all functionality out of utils and into cnc_hotfix.py * Merge remote-tracking branch 'origin/main' into hotfix/plan_state * remove duplicated pythonpath in pyproject.toml * format cnc_hotfix.py * changed to use valid.STATE_MAP to not duplicate functionality 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.