From f67c0645ea76ae8e7acaf1df27e734384d5dd10a Mon Sep 17 00:00:00 2001
From: Nick Santana <nick@mobilecoin.com>
Date: Fri, 5 May 2023 08:48:31 -0700
Subject: [PATCH] Allow merge commits

Previously merge commits were disallowed. When using stacked PRs, if the
initial PR uses a squash merge, git and github loose the information to
associate the initial commits in subsequent PRs as belonging to the
initial PR. This results in github saying there are merge conflicts.
Using merge commits allows github to better keep track of which commits
are unique to each PR.
---
 .github/settings.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index f889f2f..117e940 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -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
@@ -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
@@ -113,5 +114,4 @@ branches:
           - "test (stable)"
           - coverage
       enforce_admins: true
-      required_linear_history: true
       restrictions: null