Alex Galarce
3608a56509
Process-related prompt changes * add latest and greatest effective date prompt * fix gitignore for nltk and add missing files * Merge remote-tracking branch 'origin/bugfix/nltk-files' into field/document-dates * Merge remote-tracking branch 'origin/main' into field/document-dates * Merge remote-tracking branch 'origin/main' into field/document-dates * point NLTK to right path finally * Merge remote-tracking branch 'origin/bugfix/fix-nltk-to-new-path' into field/document-dates * iterate on effective date prompt * move single fields to pipe delimiters * rework templates * comment out valid_values error and change chroma filename handling * Merged main into field/document-dates 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.