Skip to content

Commit f1677a6

Browse files
authored
Remove conversation resolution requirement for merging
Removed the section about requiring conversation resolution before merging, ensuring that all comments must be addressed before merging is no longer a requirement.
1 parent 5e0cd60 commit f1677a6

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/about-protected-branches.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ By default, the restrictions of a branch protection rule don't apply to people w
4848
For each branch protection rule, you can choose to enable or disable the following settings.
4949
* [Require pull request reviews before merging](#require-pull-request-reviews-before-merging)
5050
* [Require status checks before merging](#require-status-checks-before-merging)
51-
* [Require conversation resolution before merging](#require-conversation-resolution-before-merging)
5251
* [Require signed commits](#require-signed-commits)
5352
* [Require linear history](#require-linear-history)
5453
* [Require merge queue](#require-merge-queue)
@@ -86,6 +85,8 @@ Optionally, you can choose to require reviews from code owners. If you do, any p
8685

8786
Optionally, you can require that the most recent reviewable push must be approved by someone other than the person who pushed it. This means at least one other authorized reviewer has approved any changes. For example, the "last reviewer" can check that the latest set of changes incorporates feedback from other reviews, and does not add new, unreviewed content.
8887

88+
Optionally, you can select Require conversation resolution before merging to require all comments on the pull request to be resolved before it can be merged into a protected branch. This ensures that all comments are addressed or acknowledged before the pull request is merged.
89+
8990
For complex pull requests that require many reviews, requiring an approval from someone other than the last person to push can be a compromise that avoids the need to dismiss all stale reviews: with this option, "stale" reviews are not dismissed, and the pull request remains approved as long as someone other than the person who made the most recent changes approves it. Users who have already reviewed a pull request can reapprove after the most recent push to meet this requirement. If you are concerned about pull requests being "hijacked" (where unapproved content is added to approved pull requests), it is safer to dismiss stale reviews.
9091

9192
{% data reusables.pull_requests.security-changes-mergeability %}
@@ -110,10 +111,6 @@ You can set up required status checks to either be "loose" or "strict." The type
110111

111112
For troubleshooting information, see [AUTOTITLE](/pull-requests/how-tos/merge-and-close-pull-requests/troubleshooting-required-status-checks).
112113

113-
### Require conversation resolution before merging
114-
115-
Requires all comments on the pull request to be resolved before it can be merged to a protected branch. This ensures that all comments are addressed or acknowledged before merge.
116-
117114
### Require signed commits
118115

119116
When you enable required commit signing on a branch, contributors {% ifversion fpt or ghec %}and bots{% endif %} can only push commits that have been signed and verified to the branch. For more information, see [AUTOTITLE](/authentication/managing-commit-signature-verification/about-commit-signature-verification).

0 commit comments

Comments
 (0)