Katon Minhas
b296cd187b
Bugfix/dynamic assignment issue * Merged main into feature/proc-desc * Uncomment test code * Bugfix * script optimisation for codes * modified is empty function in string utils * Remove test.py * bug fix to handle list of proc_codes * Merged main into bugfix/proc-code-lists * changed any method to all method in list handling * code mapping moved outside to run once * Merge branch 'feature/daip2-97' into bugfix/proc-code-lists * merge conflict fixed * merge conflicts fixed * incorporated latest changes from main * Merged main into bugfix/proc-code-lists * Move load all dataset to io_utils * Fix list is_empty * Updated poetry.lock * Bugfix * Docstring * Docstrings * Merge branch 'main' into bugfix/proc-code-lists * Merge branch 'bugfix/proc-code-lists' into bugfix/dynamic-assignment-issue * Update test for no default exhibit_level_answer_dict * Merged main into bugfix/dynamic-assignment-issue 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.