rulesets: Add allowed merge methods

llucax · llucax · commit c9d7d8925cb2 · 2025-03-29T17:58:34.000+01:00
Signed-off-by: Leandro Lucarella &lt;luca-frequenz@llucax.com&gt;
diff --git a/github-rulesets/python/Protect version branches.json b/github-rulesets/python/Protect version branches.json
@@ -27,7 +27,12 @@
         "require_last_push_approval": true,
         "dismiss_stale_reviews_on_push": true,
         "required_approving_review_count": 1,
-        "required_review_thread_resolution": false
+        "required_review_thread_resolution": false,
+        "allowed_merge_methods": [
+          "merge",
+          "squash",
+          "rebase"
+        ]
       }
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,12 @@`
`27`	`27`	`"require_last_push_approval": true,`
`28`	`28`	`"dismiss_stale_reviews_on_push": true,`
`29`	`29`	`"required_approving_review_count": 1,`
`30`		`- "required_review_thread_resolution": false`
	`30`	`+ "required_review_thread_resolution": false,`
	`31`	`+ "allowed_merge_methods": [`
	`32`	`+ "merge",`
	`33`	`+ "squash",`
	`34`	`+ "rebase"`
	`35`	`+ ]`
`31`	`36`	`}`
`32`	`37`	`},`
`33`	`38`	`{`