Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5980920

Browse filesBrowse files
tswasttswast
authored
chore: disable required linear history on v3 branch (#1018)
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)
1 parent 1762e5b commit 5980920
Copy full SHA for 5980920

File tree

Expand file treeCollapse file tree

1 file changed

+4
-0
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+4
-0
lines changed

‎.github/sync-repo-settings.yaml

Copy file name to clipboardExpand all lines: .github/sync-repo-settings.yaml
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/sync-repo-settings
2+
# Allow merge commits to sync main and v3 with fewer conflicts.
3+
mergeCommitAllowed: true
24
# Rules for main branch protection
35
branchProtectionRules:
46
# Identifies the protection rule pattern. Name of the branch to be protected.
57
# Defaults to `main`
68
- pattern: main
9+
requiresLinearHistory: true
710
requiresCodeOwnerReviews: true
811
requiresStrictStatusChecks: true
912
requiredStatusCheckContexts:
@@ -15,6 +18,7 @@ branchProtectionRules:
1518
- 'Samples - Python 3.7'
1619
- 'Samples - Python 3.8'
1720
- pattern: v3
21+
requiresLinearHistory: false
1822
requiresCodeOwnerReviews: true
1923
requiresStrictStatusChecks: true
2024
requiredStatusCheckContexts:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.