VenkataKrishna Reddy Avula
732d345d7f
Feature/daip2-123 to Main * indirect proc codes added * bug fix * bug fix * Merge branch 'main' into proc-code-indirect * bug fix * diag cd indirect added * Merge branch 'main' into daip2-111 * modified get code description for revenue codes * removed print statements * Merged main into feature/daip2-123 * Merge remote-tracking branch 'origin/main' into feature/daip2-123 * Merged main into feature/daip2-123 * modified find containing ranges * modified get code description * updated get code description function * updated descriptions code * Merge remote-tracking branch 'origin/main' into feature/daip2-123 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.