Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/standarts/branching.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ and release workflows.

Supporting branches are used for implementing changes and preparing releases.

- `feature/<name>` — development of new functionality.
- `feat/<name>` — development of new functionality.
- `bugfix/<issue>-<name>` — fixes for non-critical bugs.
- `hotfix/<name>` — urgent fixes for critical issues in released versions.
- `release/<version>` — release preparation and stabilization.
Expand All @@ -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

Expand All @@ -58,7 +58,7 @@ General rules:

Examples:
```text
feature/<short-summary>
feat/<short-summary>
bugfix/<issue-number>-<short-summary>
hotfix/<short-summary>
release/<version>
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down