Use normal merge

GeyserMC · Feb 4, 2025 · 3f0f793 · 3f0f793
1 parent 7761f77
commit 3f0f793
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -2,8 +2,8 @@ version: "1"
 rules:
   - base: main # Target branch
     upstream: PaperMC:dev/3.0.0 # Must be in the same fork network.
-    mergeMethod: hardreset # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
+    mergeMethod: merge # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
     mergeUnstable: false # merge pull request even when the mergeable_state is not clean. Default: false
     conflictReviewers: # Optional, on merge conflict assign a reviewer
       - Tim203
-conflictLabel: "merge-conflict" # Optional, on merge conflict assign a custom label, Default: merge-conflict
+conflictLabel: "merge-conflict" # Optional, on merge conflict assign a custom label, Default: merge-conflict