From 62d0e4ba6c9dd93a49984f19d9c2d65e434637fc Mon Sep 17 00:00:00 2001
From: Finn <finn@finn.io>
Date: Sat, 7 Sep 2024 23:27:37 -0700
Subject: [PATCH] forgejo: change default PR merge strategy to rebase

---
 k8s/forgejo/config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/k8s/forgejo/config.yaml b/k8s/forgejo/config.yaml
index c606d69..d341f4e 100644
--- a/k8s/forgejo/config.yaml
+++ b/k8s/forgejo/config.yaml
@@ -29,6 +29,7 @@ data:
   FORGEJO__server__ROOT_URL: https://git.janky.solutions/
   FORGEJO__server__DOMAIN: git.janky.solutions
   FORGEJO__DEFAULT__APP_NAME: Janky Solutions
+  DEFAULT_MERGE_STYLE: rebase
   # FORGEJO__storage__STORAGE_TYPE: minio
   # FORGEJO__storage__MINIO_ENDPOINT: storage.home.finn.io
   # FORGEJO__storage__MINIO_USE_SSL: "true"