Skip to content

Commit

Permalink
chore: disable required linear history on v3 branch (googleapis#1018)
Browse files Browse the repository at this point in the history
This should prevent conflicts when we sync v3 with main.

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/python-bigquery/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)
  • Loading branch information
tswast authored and abdelmegahedgoogle committed Apr 17, 2023
1 parent c522888 commit 726eb24
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/sync-repo-settings
# Allow merge commits to sync main and v3 with fewer conflicts.
mergeCommitAllowed: true
# Rules for main branch protection
branchProtectionRules:
# Identifies the protection rule pattern. Name of the branch to be protected.
# Defaults to `main`
- pattern: main
requiresLinearHistory: true
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: true
requiredStatusCheckContexts:
Expand All @@ -15,6 +18,7 @@ branchProtectionRules:
- 'Samples - Python 3.7'
- 'Samples - Python 3.8'
- pattern: v3
requiresLinearHistory: false
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: true
requiredStatusCheckContexts:
Expand Down

0 comments on commit 726eb24

Please sign in to comment.