diff --git a/docs/standarts/branching.md b/docs/standarts/branching.md index 0d7de14..3f1a4d8 100644 --- a/docs/standarts/branching.md +++ b/docs/standarts/branching.md @@ -16,7 +16,7 @@ and release workflows. Supporting branches are used for implementing changes and preparing releases. -- `feature/` — development of new functionality. +- `feat/` — development of new functionality. - `bugfix/-` — fixes for non-critical bugs. - `hotfix/` — urgent fixes for critical issues in released versions. - `release/` — release preparation and stabilization. @@ -31,7 +31,7 @@ Supporting branches are used for implementing changes and preparing releases. - The `develop` branch may contain work-in-progress functionality but must remain in a working state. -- `feature/*` and `bugfix/*` branches: +- `feat/*` and `bugfix/*` branches: - are created from `develop` - are merged back into `develop` via pull requests @@ -58,7 +58,7 @@ General rules: Examples: ```text -feature/ +feat/ bugfix/- hotfix/ release/ diff --git a/pyproject.toml b/pyproject.toml index 06cc2ec..6657923 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -151,7 +151,7 @@ issue_format = "[#{issue}](https://github.com/LandSight/backend/issues/{issue})" [[tool.towncrier.type]] name = "Feature" -directory = "feature" +directory = "feat" showcontent = true [[tool.towncrier.type]]