From ab873b8cd1bce8f69d54f1336ef0eb535481f982 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Mon, 15 Jun 2026 08:26:16 -0400
Subject: [PATCH] Do not restrict merge types by default

The changes in #98 restricted regular merges and squash merges. This has
caused problems with CI because tide is attempting to create merge commits.

This change sets the default value for alllow_merge_commit and
allow_squash_merge to `true` pending further discussion.
---
 modules/common_repository/variables.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/common_repository/variables.tf b/modules/common_repository/variables.tf
index 1a2e6cf..f5c855a 100644
--- a/modules/common_repository/variables.tf
+++ b/modules/common_repository/variables.tf
@@ -134,13 +134,13 @@ variable "push_allowances" {
 variable "allow_merge_commit" {
   description = "Allow merge commits on pull requests"
   type        = bool
-  default     = false
+  default     = true
 }
 
 variable "allow_squash_merge" {
   description = "Allow squash merging on pull requests"
   type        = bool
-  default     = false
+  default     = true
 }
 
 variable "allow_rebase_merge" {