Add .git-branches.toml (#207)

alphatroya · Oct 16, 2024 · 5b6c545 · 5b6c545
1 parent b6b2e78
commit 5b6c545
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [2.5.0] - 2024-10-16
+### Added
+- Добавлен `.git-branches.toml` файл для настройки работы проекта с [git-town](https://github.com/git-town/git-town).
+
 ## [2.4.0] - 2024-06-20
 
 ### Removed

diff --git a/{{ cookiecutter.name }}/.git-branches.toml b/{{ cookiecutter.name }}/.git-branches.toml
@@ -0,0 +1,12 @@
+push-new-branches = false
+ship-delete-tracking-branch = true
+sync-upstream = false
+
+[branches]
+main = "develop"
+perennials = ["main"]
+perennial-regex = ""
+
+[sync-strategy]
+feature-branches = "merge"
+perennial-branches = "rebase"
diff --git a/{{ cookiecutter.name }}/README.md b/{{ cookiecutter.name }}/README.md
@@ -22,4 +22,4 @@ Before launching the project, it's important to confirm that each team member ha
 
 ---
 
-This project was created using [the project template](https://github.com/alphatroya/swift-project-template) version 2.4.0.
+This project was created using [the project template](https://github.com/alphatroya/swift-project-template) version 2.5.0.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,4 @@ Before launching the project, it's important to confirm that each team member ha

		---

		This project was created using [the project template](https://github.com/alphatroya/swift-project-template) version 2.4.0.
		This project was created using [the project template](https://github.com/alphatroya/swift-project-template) version 2.5.0.