Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

branch protection documents don't talk about conflicts between protection rules #15965

Closed
1 task done
jsoref opened this issue Mar 1, 2022 · 7 comments
Closed
1 task done
Labels
content This issue or pull request belongs to the Docs Content team repositories Content related to repositories stale There is no recent activity on this issue or pull request waiting for review Issue/PR is waiting for a writer's review

Comments

@jsoref
Copy link
Contributor

jsoref commented Mar 1, 2022

Code of Conduct

What article on docs.github.com is affected?

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches
https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#about-branch-protection-rules

What part(s) of the article would you like to see updated?

Something should mention that one can't have two branch protection rules that match the same branch, or if one can, it should explain how priority works.

Searching for conflict only shows hits for merge conflict.

Note: it appears impossible to deep link to any of the steps in https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#creating-a-branch-protection-rule which means I can't link to:

Under "Branch name pattern", type the branch name or pattern you want to protect.

Offhand, text should probably be included here warning that one should work to avoid having patterns in branch protection rules that conflict.

Additional information

community/community#12257

@jsoref jsoref added the content This issue or pull request belongs to the Docs Content team label Mar 1, 2022
@github-actions github-actions bot added the triage Do not begin working on this issue until triaged by the team label Mar 1, 2022
@ramyaparimi ramyaparimi added waiting for review Issue/PR is waiting for a writer's review repositories Content related to repositories and removed triage Do not begin working on this issue until triaged by the team labels Mar 2, 2022
@ramyaparimi
Copy link
Contributor

@jsoref
Thanks so much for opening an issue! I'll triage this for the team to take a look 👀

@lecoursen
Copy link
Member

lecoursen commented Mar 3, 2022

Thanks @jsoref, I believe the answer to your question is here:

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#about-branch-protection-rules

If a repository has multiple protected branch rules that affect the same branches, the rules that include a specific branch name have the highest priority. If there is more than one protected branch rule that references the same specific branch name, then the branch rule created first will have higher priority.

Was there something else you had in mind? Feel free to re-open if I'm misunderstanding!

Offhand, text should probably be included here warning that one should work to avoid having patterns in branch protection rules that conflict.

I don't think this is something we would recommend.

@jsoref
Copy link
Contributor Author

jsoref commented Mar 3, 2022

Interesting, then why does the UI tell me I have a conflict?

At the very least, that text should have the word conflict so that users hitting the error message can find the documentation.

@lecoursen lecoursen reopened this Mar 3, 2022
@github-actions github-actions bot added the triage Do not begin working on this issue until triaged by the team label Mar 3, 2022
@lecoursen
Copy link
Member

Great question! I agree that we could address what that "conflict" means in the UI... but I must admit, I don't actually know. Let's see if we get some answers in that feedback issue, so we know what to add.

@ramyaparimi ramyaparimi removed the triage Do not begin working on this issue until triaged by the team label Mar 11, 2022
@github-actions github-actions bot added stale There is no recent activity on this issue or pull request and removed stale There is no recent activity on this issue or pull request labels May 10, 2022
@github-actions github-actions bot added stale There is no recent activity on this issue or pull request and removed stale There is no recent activity on this issue or pull request labels Jul 11, 2022
@github-actions github-actions bot added stale There is no recent activity on this issue or pull request and removed stale There is no recent activity on this issue or pull request labels Sep 10, 2022
@cmwilson21 cmwilson21 added the more-information-needed More information is needed to complete review label Oct 7, 2022
@github-actions
Copy link
Contributor

This issue has been automatically closed because there has been no response to our request for more information from the original author. With only the information that is currently in the issue, we don't have enough information to take action. Please reach out if you have or find the answers we need so that we can investigate further. See this blog post on bug reports and the importance of repro steps for more information about the kind of information that may be helpful.

@jsoref
Copy link
Contributor Author

jsoref commented Oct 21, 2022

@lecoursen not even a nibble

@github-actions github-actions bot removed the more-information-needed More information is needed to complete review label Oct 21, 2022
@github-actions github-actions bot reopened this Oct 21, 2022
@github-actions github-actions bot added stale There is no recent activity on this issue or pull request and removed stale There is no recent activity on this issue or pull request labels Dec 20, 2022
@github-actions github-actions bot added the stale There is no recent activity on this issue or pull request label Feb 20, 2023
@github-actions github-actions bot closed this as not planned Won't fix, can't repro, duplicate, stale Feb 27, 2023
@jsoref
Copy link
Contributor Author

jsoref commented May 10, 2023

@cmwilson21 can you please find someone who could comment?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
content This issue or pull request belongs to the Docs Content team repositories Content related to repositories stale There is no recent activity on this issue or pull request waiting for review Issue/PR is waiting for a writer's review
Projects
None yet
Development

No branches or pull requests

6 participants
@jsoref @lecoursen @ramyaparimi @cmwilson21 and others