Katon Minhas
8c99f5d073
Bugfix/dynamic primary issues * format and restructure * checkpoint * Merge branch 'main' into bugfix/dynamic-primary-issues * Update constants attributes to base class * Revert "Update constants attributes to base class" This reverts commit 936b1e41f2e2d445e69e840b69af08eac6661120. * Fix mapping * E2E test * remove prints * Merge branch 'main' into bugfix/dynamic-primary-issues * Black * Update any dynamic * Prompt update - more leniency * Remove prints * Merged main into bugfix/dynamic-primary-issues * update crosswalk * Merged main into bugfix/dynamic-primary-issues 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.