From 5b6c545976b03c2054a3e847956dedc2268e8dde Mon Sep 17 00:00:00 2001 From: Alexey Korolev Date: Wed, 16 Oct 2024 11:52:50 +0300 Subject: [PATCH] Add .git-branches.toml (#207) --- CHANGELOG.md | 4 ++++ {{ cookiecutter.name }}/.git-branches.toml | 12 ++++++++++++ {{ cookiecutter.name }}/README.md | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 {{ cookiecutter.name }}/.git-branches.toml diff --git a/CHANGELOG.md b/CHANGELOG.md index 0182dd9..ea94456 100644 --- 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 new file mode 100644 index 0000000..9a7b97a --- /dev/null +++ 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 index b3d90c9..a357edd 100644 --- 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.