Mayank Aamseek
3f3e1b1c7a
Bugfix/unit of measure * updated trigger_cap definition * updated trigger_cap definition_new * updated triggerbase threshold prompt * updated Trigger Cap Def * Merge branch 'main' into bugfix/special_case_fixes * Merge branch 'main' into bugfix/special_case_fixes * prompt changes * Merge branch 'main' into bugfix/unit_of_measure * post processing and prompts updated * print statements removed * print statements removed * prompt updated 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.