From a425f8715fea4f97e453afcaba7d71bad91b30f9 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Wed, 4 Feb 2026 09:24:20 +1000
Subject: [PATCH] [forge] set default merge style to rebase

fixes: forge/forge#353

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
---
 roles/openshift-apps/forgejo/templates/values.yaml.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/openshift-apps/forgejo/templates/values.yaml.j2 b/roles/openshift-apps/forgejo/templates/values.yaml.j2
index 0db201f9f6..b9343f5321 100644
--- a/roles/openshift-apps/forgejo/templates/values.yaml.j2
+++ b/roles/openshift-apps/forgejo/templates/values.yaml.j2
@@ -572,6 +572,7 @@ gitea:
     repository:
       MAX_CREATION_LIMIT: 0
       ALLOW_FORK_WITHOUT_MAXIMUM_LIMIT: true
+      DEFAULT_MERGE_STYLE: rebase
 
     ## @param gitea.config.cors Cross-origin resource sharing settings
     cors: {}