Merge pull request #707 from CenterForOpenScience/develop

brianjgeiger · web-flow · commit 4dc87369bc6b · 2025-10-23T11:21:10.000-04:00
Merge develop into release branch
diff --git a/.github/rules/All Branch Rules.json b/.github/rules/All Branch Rules.json
@@ -8,7 +8,7 @@
   "conditions": {
     "ref_name": {
       "exclude": ["refs/heads/main", "refs/heads/develop"],
-      "include": ["~ALL"]
+      "include": ["~DEFAULT_BRANCH", "refs/heads/main"]
     }
   },
   "rules": [
@@ -29,7 +29,7 @@
         "require_code_owner_review": false,
         "require_last_push_approval": true,
         "automatic_copilot_code_review_enabled": false,
-        "allowed_merge_methods": ["squash"]
+        "allowed_merge_methods": ["merge", "squash", "rebase"]
       }
     }
   ],
diff --git a/.github/rules/Main_Develop Branch Rules.json b/.github/rules/Main_Develop Branch Rules.json
@@ -21,7 +21,7 @@
     {
       "type": "merge_queue",
       "parameters": {
-        "merge_method": "SQUASH",
+        "merge_method": "MERGE",
         "max_entries_to_build": 8,
         "min_entries_to_merge": 1,
         "max_entries_to_merge": 5,
@@ -44,7 +44,7 @@
         "require_code_owner_review": false,
         "require_last_push_approval": true,
         "automatic_copilot_code_review_enabled": false,
-        "allowed_merge_methods": ["squash"]
+        "allowed_merge_methods": ["merge", "squash", "rebase"]
       }
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"conditions": {`
`9`	`9`	`"ref_name": {`
`10`	`10`	`"exclude": ["refs/heads/main", "refs/heads/develop"],`
`11`		`- "include": ["~ALL"]`
	`11`	`+ "include": ["~DEFAULT_BRANCH", "refs/heads/main"]`
`12`	`12`	`}`
`13`	`13`	`},`
`14`	`14`	`"rules": [`
`@@ -29,7 +29,7 @@`
`29`	`29`	`"require_code_owner_review": false,`
`30`	`30`	`"require_last_push_approval": true,`
`31`	`31`	`"automatic_copilot_code_review_enabled": false,`
`32`		`- "allowed_merge_methods": ["squash"]`
	`32`	`+ "allowed_merge_methods": ["merge", "squash", "rebase"]`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`],`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`{`
`22`	`22`	`"type": "merge_queue",`
`23`	`23`	`"parameters": {`
`24`		`- "merge_method": "SQUASH",`
	`24`	`+ "merge_method": "MERGE",`
`25`	`25`	`"max_entries_to_build": 8,`
`26`	`26`	`"min_entries_to_merge": 1,`
`27`	`27`	`"max_entries_to_merge": 5,`
`@@ -44,7 +44,7 @@`
`44`	`44`	`"require_code_owner_review": false,`
`45`	`45`	`"require_last_push_approval": true,`
`46`	`46`	`"automatic_copilot_code_review_enabled": false,`
`47`		`- "allowed_merge_methods": ["squash"]`
	`47`	`+ "allowed_merge_methods": ["merge", "squash", "rebase"]`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`],`