Mayank Aamseek
29612ed042
Bugfix/fee rate conversion rate * printing incorrect recall values * values responsible for low recall added in spreadsheet * changing match list to unmatch list for breakouts * recall values added for 1-to-N * print statements removed * removed print statements * Merged main into feature/test_files * output formatting fix * fixed cases where conversion factor was shown as fee rate * Merged main into bugfix/fee_rate_conversion_rate * Merged main into bugfix/fee_rate_conversion_rate * unit of measure fixed * Merge branch 'bugfix/fee_rate_conversion_rate' of https://bitbucket.org/aarete/doczy.ai into bugfix/fee_rate_conversion_rate * Merged main into bugfix/fee_rate_conversion_rate * functionality to create and compare multiple rows for AARETE_DERIVED_LOB added * Merge branch 'bugfix/fee_rate_conversion_rate' of https://bitbucket.org/aarete/doczy.ai into bugfix/fee_rate_conversion_rate * Merged main into bugfix/fee_rate_conversion_rate 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.