Mayank Aamseek
5d65251851
Bugfix/claim type 1 to 1 * restored old prompt * updated claim type cd prompt * claim_type exhibit level added * Merge branch 'bugfix/claim_type_1_to_1' of https://bitbucket.org/aarete/doczy.ai into bugfix/claim_type_1_to_1 * field type updated * Merge remote-tracking branch 'origin/main' into bugfix/claim_type_1_to_1 * fixed location of updating field_type to full_context * updated ancillary examples * removed print statements * Merge branch 'bugfix/claim_type_1_to_1' of https://bitbucket.org/aarete/doczy.ai into bugfix/claim_type_1_to_1 * prompt updated to avoid N/A * Merge remote-tracking branch 'origin/main' into bugfix/claim_type_1_to_1 * prompt changed to handle multiple matches * prompt updated * Merge remote-tracking branch 'origin/main' into bugfix/claim_type_1_to_1 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.