Menu
I want to add a rule so the PR with open conversations can not be merged. It occurs that I can find a typo in PR and add a comment and still approve the PR, so that an author has the opportunity to quickly correct this typo and merge the PR. But I want it to be impossible to merge the PR until an author resolves the conversation. Is it possible to do this?
453
You may choose to close a pull request without merging it into the upstream branch. This can be handy if the changes proposed in the branch are no longer needed, or if another solution has been proposed in another branch.
Disabling auto-mergeOn GitHub.com, navigate to the main page of the repository. Under your repository name, click Pull requests. In the "Pull Requests" list, click the pull request you'd like to disable auto-merge for. In the merge box, click Disable auto-merge.
If it's a question, then the reviewer probably wants to see the author's response. This suggests that the author should not be the one to resolve the conversation: once the conversation is marked resolved, it is likely to be hidden at least one and possibly more clicks away from the reviewer's sight.
You can only resolve merge conflicts on GitHub that are caused by competing line changes, such as when people make different changes to the same line of the same file on different branches in your Git repository. For all other types of merge conflicts, you must resolve the conflict locally on the command line.
If you have more than one file with a conflict, select the next file you want to edit on the left side of the page under "conflicting files" and repeat steps four through seven until you've resolved all of your pull request's merge conflicts. Once you've resolved all your merge conflicts, click Commit merge.
You can resolve a conversation in a pull request if you opened the pull request or if you have write access to the repository where the pull request was opened. To indicate that a conversation on the Files changed tab is complete, click Resolve conversation.
If the head branch is protected you won't be able to merge your conflict resolution into it, so you'll be prompted to create a new head branch. For more information, see " About protected branches ."
It looks like they've added a branch rule option for this but it indicates that the functionality is still in Beta.
Simply go to Settings -> Branches and check the Require conversation resolution before merging field.
181
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
