Mayank Aamseek
28ab4b5d93
Initialize conversion factor * REIMB_CONVERSION_FACTOR prompt added * Merge branch 'main' into initialize-conversion-factor * Merge branch 'main' into initialize-conversion-factor * conversion factor fixed * prompt fix for conversion factor * Merge branch 'main' into initialize-conversion-factor * prompts updated for REIMB_FEE_RATE and AARETE_DERIVED_REIMB_METHOD * Merged main into initialize-conversion-factor * prompt fix * Merge branch 'initialize-conversion-factor' of https://bitbucket.org/aarete/doczy.ai into initialize-conversion-factor 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.