From d75b910ad2d1d50424d8a2b791e2f327e7431771 Mon Sep 17 00:00:00 2001
From: Avichai Cohen <cavichai@videocites.com>
Date: Sun, 16 Jun 2019 12:46:03 +0300
Subject: [PATCH] changing the merge method from master

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

diff --git a/.github/pull.yml b/.github/pull.yml
index b55ef8820..cb259a99c 100644
--- a/.github/pull.yml
+++ b/.github/pull.yml
@@ -2,7 +2,7 @@ version: "1"
 rules:
   - base: master
     upstream: ytdl-org:master
-    mergeMethod: hardreset
+    mergeMethod: merge
     reviewers:
       - aviperes
       - hashark