From 0349a6ebc2a3d4cae5ac4f0607baf3926f363d91 Mon Sep 17 00:00:00 2001 From: Daniel Bengl Date: Thu, 19 Feb 2026 09:16:25 +0100 Subject: [PATCH 1/2] Add hint regarding redesign --- configure_git_repository.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure_git_repository.md b/configure_git_repository.md index 00885308..235276a1 100644 --- a/configure_git_repository.md +++ b/configure_git_repository.md @@ -16,6 +16,7 @@ Please stick to it unless you have special needs. * Branches * Default branch: either `main` or `develop` depending on whether you want one or two environments. * Rules/Rulesets + * ⚠️ Long-lived branches (e.g. `redesign`, `v2`) should follow the same protection rules as `develop`. * `develop` * Enforcement status: `Active` * Branch targeting criteria: `develop` @@ -55,3 +56,4 @@ Thanks to this we can: * @renuo/[team-name] ``` + From f3d806963d75e65329809d60f9863122c441639b Mon Sep 17 00:00:00 2001 From: Daniel Bengl Date: Thu, 19 Feb 2026 09:33:04 +0100 Subject: [PATCH 2/2] Update doc --- configure_git_repository.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure_git_repository.md b/configure_git_repository.md index 235276a1..06b689da 100644 --- a/configure_git_repository.md +++ b/configure_git_repository.md @@ -16,10 +16,12 @@ Please stick to it unless you have special needs. * Branches * Default branch: either `main` or `develop` depending on whether you want one or two environments. * Rules/Rulesets - * ⚠️ Long-lived branches (e.g. `redesign`, `v2`) should follow the same protection rules as `develop`. - * `develop` + * We use two rulesets: one for `main` and one for everything else. This ensures that long-lived branches like `redesign` and feature branches like `feat/my-feature` share the same protection rules as `develop`. + * `non-main` * Enforcement status: `Active` - * Branch targeting criteria: `develop` + * Branch targeting criteria: + * Include all branches + * Exclude by pattern: `main` * Bypass list: add `Repository Admin` Role with *allow for pull requests only* option * Restrict deletions * Require linear history @@ -27,11 +29,10 @@ Please stick to it unless you have special needs. * Require status checks to pass * Select `ci/semaphore/push` * Block force pushes - * `main` (same as develop but...) + * `main` (same as non-main but...) * Branch targeting criteria: `main` * ❌ Require a pull request before merging * ❌ Require status checks to pass - * Autolink references * Add a new Autolink reference with: * Reference prefix: `TICKET-` @@ -56,4 +57,3 @@ Thanks to this we can: * @renuo/[team-name] ``` -