changing the merge method from master

2026-05-27 01:36:06 +08:00 · 2019-06-16 12:46:03 +03:00
parent d2fdf7c227
commit d75b910ad2
1 changed files with 1 additions and 1 deletions
@@ -2,7 +2,7 @@ version: "1"
 rules:
  - base: master
    upstream: ytdl-org:master
-    mergeMethod: hardreset
+    mergeMethod: merge
    reviewers:
      - aviperes
      - hashark