-
Notifications
You must be signed in to change notification settings - Fork 0
Development rules (adapted GitFLOW)
Lev Nikolaevich edited this page Apr 25, 2024
·
4 revisions
-
Main Branches:
-
main
: The development branch that holds all the latest changes for upcoming releases.
-
-
Support Branches:
- Feature branches (
feature/
): Created from themain
branch for developing new features. Once the feature is complete, the branch is merged back intomain
. - The name of this branche consist of index and name ot the issue:
DEMINT-005-add-llm-to-explain-error-in-sentence
- Feature branches (
-
Merge Rules:
- Before creating a pull request, it is mandatory to squash all commits to keep the history clean.
- Always update the feature branch from the main branch by performing a rebase before making a pull request, to ensure that it is up-to-date with the latest changes.
- After finishing in the feature branch, a pull request should be made to the appropriate target branch (
main
). This facilitates code review before merging.
-
Usage Recommendations:
- Developers should frequently update their local
main
andfeature
branches from the mainmain
branch to avoid conflicts during merging. - It is recommended to use a visual interface, such as Docker Desktop, for managing Git operations. This approach can help visualize branch structures and streamline Git workflows.
- Developers should frequently update their local