From 37e2b385273e520ea3de38ba01a1c16de1ad8028 Mon Sep 17 00:00:00 2001 From: Sophie <29382425+sophietheking@users.noreply.github.com> Date: Mon, 24 Mar 2025 18:09:19 +0100 Subject: [PATCH] Merge method rule [GA] (#54698) Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com> --- .../managing-rulesets/available-rules-for-rulesets.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesets.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesets.md index 796bc86dd9..cc9bb852ea 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesets.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesets.md @@ -131,10 +131,7 @@ For complex pull requests that require many reviews, requiring an approval from Optionally, you can require all comments on the pull request to be resolved before it can be merged to a branch. This ensures that all comments are addressed or acknowledged before merge. {% ifversion repo-rules-merge-type %} -> [!NOTE] -> Allowed merge method is currently in public preview, the rule is currently non-bypassable, and subject to change. - -Optionally, you can require a merge type of merge, squash or rebase. This means the targeted branches may only be merged based on the allowed type. Additionally if the repository has disabled a merge method and the ruleset required a different method, the merge will be blocked. For more information, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github). +Optionally, you can require a merge type of merge, squash, or rebase. This means the targeted branches may only be merged based on the allowed type. Additionally if the repository has disabled a merge method and the ruleset required a different method, the merge will be blocked. See [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github). {% endif %} ## Require status checks to pass before merging