Mayank Aamseek
6f1d7d90b4
Hotfix/methodology breakout issue fixes * Merge branch 'hotfix/methodology_breakout_issue_fixes' of https://bitbucket.org/aarete/doczy.ai into hotfix/methodology_breakout_issue_fixes merged with current local changes * opps methodology added * Merge branch 'main' into hotfix/methodology_breakout_issue_fixes * Merge branch 'main' into hotfix/methodology_breakout_issue_fixes merged changes from main * Merged main into hotfix/methodology_breakout_issue_fixes * duplicate N/A fixed * Merge branch 'hotfix/methodology_breakout_issue_fixes' of https://bitbucket.org/aarete/doczy.ai into hotfix/methodology_breakout_issue_fixes merged changes from main * updated AARETE_DERIVED_REIMB_METHOD prompt * fee schedule prompt change * REIMB_PCT_RATE prompt updated * Merged main into hotfix/methodology_breakout_issue_fixes * opps moved to grouper * fee rate format fixed * removed incentives * removed funding and additional reimbursement * separate invalid reimb * Merge branch 'main' into hotfix/methodology_breakout_issue_fixes * merged main into current branch * updated valid reimb and fee_schedule_version * code structure fix * code structure fix 2 * Merge branch 'main' into hotfix/methodology_breakout_issue_fixes * updated methodology breakout fields * test notebook updated * Merged main into hotfix/methodology_breakout_issue_fixes 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.