From ded02f015f907d7dfaf754981eb90647b6a82e6a Mon Sep 17 00:00:00 2001
From: Oldcustard <147gusto@gmail.com>
Date: Sun, 26 Feb 2023 22:03:35 +1100
Subject: [PATCH] change to merge method

---
 .github/pull.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/pull.yml b/.github/pull.yml
index d99c6c7..fbdeb18 100644
--- a/.github/pull.yml
+++ b/.github/pull.yml
@@ -2,4 +2,4 @@ version: "1"
 rules:
   - base: master
     upstream: ozfortress:master  # change `wei` to the owner of upstream repo
-    mergeMethod: rebase
+    mergeMethod: merge