From 57505f0551f21f66a8354f6e8b461553448efc2a Mon Sep 17 00:00:00 2001
From: Tim Schilling <schillingt@better-simple.com>
Date: Fri, 2 Aug 2024 16:57:59 -0500
Subject: [PATCH] Allow a variety of merge options on Django Commons repos.

---
 terraform/production/repositories.tfvars | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/terraform/production/repositories.tfvars b/terraform/production/repositories.tfvars
index e57960f..32f24d3 100644
--- a/terraform/production/repositories.tfvars
+++ b/terraform/production/repositories.tfvars
@@ -14,7 +14,9 @@ repositories = {
   "controls" = {
     description              = "The controls for managing Django Commons projects"
     enable_branch_protection = false
-
+    allow_merge_commit = true
+    allow_rebase_merge = true
+    allow_squash_merge = true
     topics = []
     push_allowances = []
     visibility         = "public"
@@ -24,6 +26,9 @@ repositories = {
   "membership" = {
     description        = "Membership repository for the django-commons organization."
     visibility         = "public"
+    allow_merge_commit = true
+    allow_rebase_merge = true
+    allow_squash_merge = true
     topics = []
     push_allowances = []
     skip_team_creation = true