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.

Sign up for GitHub

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

Allow merge commits #17

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow merge commits #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository:
has_downloads: false
default_branch: main
allow_squash_merge: true
allow_merge_commit: false
allow_merge_commit: true
allow_rebase_merge: false
allow_auto_merge: true
delete_branch_on_merge: true
Expand Down Expand Up @@ -82,7 +82,8 @@ branches:
protection:
required_pull_request_reviews:
require_code_owner_reviews: true
required_approving_review_count: 1
required_approving_review_count: 2
dismissal_restrictions: null
required_conversation_resolution: true
required_status_checks:
strict: false
Expand Down Expand Up @@ -113,5 +114,4 @@ branches:
- "test (stable)"
- coverage
enforce_admins: true
required_linear_history: true
restrictions: null