From fec891b2c251e80a5ea8c9e7318a42774be0a2b0 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Thu, 15 Jan 2026 12:55:37 -0800 Subject: [PATCH 1/2] Update merge rules and clarify requirements in README Signed-off-by: Pieter Viljoen --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d4f3b31..5f79be87 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,6 @@ Packages published on [NuGet](https://www.nuget.org/packages/ptr727.ProjectTempl - General: - Default branch: `main` - Pull requests: - - `Allow squash merging` - `Always suggest updating pull request branches` - `Allow auto-merge` - Rules / Rulesets: @@ -146,6 +145,7 @@ Packages published on [NuGet](https://www.nuget.org/packages/ptr727.ProjectTempl - `Require a pull request before merging` - `Dismiss stale pull request approvals when new commits are pushed` - Allowed merge methods: `Squash` + - [Note](https://github.com/orgs/community/discussions/184410): All general merge types must be enable for rulesets merge rules to be honored. - `Require status checks to pass` - `Require branches to be up to date before merging` - Status checks that are required: `Check pull request workflow status` From 60b07b6c251eb380c58203ed51e671d3546d5e3f Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Thu, 15 Jan 2026 14:30:46 -0800 Subject: [PATCH 2/2] Update merge rules in README to allow squash merging and clarify requirements Signed-off-by: Pieter Viljoen --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f79be87..0963f920 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,8 @@ Packages published on [NuGet](https://www.nuget.org/packages/ptr727.ProjectTempl - General: - Default branch: `main` - Pull requests: + - `Allow squash merging` + - [TODO:](https://github.com/orgs/community/discussions/184410): Disable merge and rebase merging, ruleset merge rules do not work. - `Always suggest updating pull request branches` - `Allow auto-merge` - Rules / Rulesets: @@ -145,7 +147,6 @@ Packages published on [NuGet](https://www.nuget.org/packages/ptr727.ProjectTempl - `Require a pull request before merging` - `Dismiss stale pull request approvals when new commits are pushed` - Allowed merge methods: `Squash` - - [Note](https://github.com/orgs/community/discussions/184410): All general merge types must be enable for rulesets merge rules to be honored. - `Require status checks to pass` - `Require branches to be up to date before merging` - Status checks that are required: `Check pull request workflow status`