Mayank Aamseek
94251faa03
Feature/grouper fields * prompt changes * print statements removed * merged with main * merge issue fixed * updated grouper prompts * updated grouper fields in fields order * updated breakout prompt * Merged main into feature/grouper-fields * reverted grouper cd prompt * updated goruper severity prompt * Merge remote-tracking branch 'origin/main' into feature/grouper-fields * updated grouper breakout function * error fixes * Merged main into feature/grouper-fields * Merged main into feature/grouper-fields * updated grouper_pct_rate and grouper_base_rate * removed empty array post processing fix * Merged main into feature/grouper-fields * post-processing for grouper rate modified * updated grouper type prompt * Merged main into feature/grouper-fields * grouper version prompt updated * Merged main into feature/grouper-fields * OPPS as APC * Merged main into feature/grouper-fields 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.