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

chore: disable required linear history on v3 branch #1018

Merged
merged 5 commits into from
Oct 12, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
add merge commits back
  • Loading branch information
tswast authored Oct 12, 2021
commit 6850c7f74cc1052835a6f29cd460c6e1ace9d8c0
2 changes: 2 additions & 0 deletions .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# 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.
Expand Down