From c238f993553654a72a490fd856b4f4e6d62eee58 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sun, 23 Oct 2022 13:27:10 -0700 Subject: ref(ops/github): only allow merge commit While not great, this is the default workflow on GitHub. It's also what allows my `git-broom` CLI to work with branches on GitHub. --- ops/github/repositories.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ops') diff --git a/ops/github/repositories.tf b/ops/github/repositories.tf index 15a5b1d..ba5cf60 100644 --- a/ops/github/repositories.tf +++ b/ops/github/repositories.tf @@ -13,9 +13,9 @@ resource "github_repository" "repos" { has_issues = try(each.value.has_issues, true) has_projects = false has_wiki = false - allow_merge_commit = false - allow_squash_merge = true - allow_rebase_merge = true + allow_merge_commit = true + allow_squash_merge = false + allow_rebase_merge = false vulnerability_alerts = try(each.value.vulnerability_alerts, false) delete_branch_on_merge = try(!each.value.archived, true) } -- cgit 1.4.1