Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The branch protection rules were updated in #437 (without any apparent discussion, which I find odd given the impact and high problematics of the change). The change applies the exact same restrictive rules to all branches, no matter their role in the development process.
This yields the following issues:
One project recently was setup according to the ASG including this change and we quickly ran into issues so I had to exclude the feature branches from the protection rules. The suggested changes in this PR now reflect what we have there. One possible alternative setup which might work would be:
Three protection rules:
main, as it is right nowdevelopand long living branches (i.e., anything that does not match*/**, so likeredesign,develop2, etc.), with the same rules as the currentnon-mainruleFeaturebranches, matching*/**, with the only rule that CI has to pass before merging, so that you don't merge failing code into another feature branch.