From 716170eaa853ddf3032baa9b107eb3e44d6a4124 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Mon, 17 Apr 2023 20:13:36 -0500
Subject: [PATCH] chore(gh): Ban rebase merges

---
 .github/settings.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index 8ead1ba..7d5e4fc 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -10,9 +10,12 @@ repository:
   has_downloads: true
   default_branch: main
 
-  allow_squash_merge: true
+  # Preference: people do clean commits
   allow_merge_commit: true
-  allow_rebase_merge: true
+  # Backup in case we need to clean up commits
+  allow_squash_merge: true
+  # Not really needed
+  allow_rebase_merge: false
 
   allow_auto_merge: true
   delete_branch_on_merge: true