From 3f9dd9719fe66c39214c6f3ce0fea3f08f65a987 Mon Sep 17 00:00:00 2001
From: Ryananana <36809659+Ryananana@users.noreply.github.com>
Date: Mon, 20 May 2024 21:29:15 +0800
Subject: [PATCH] Update fetch.yml

Signed-off-by: Ryananana <36809659+Ryananana@users.noreply.github.com>
---
 .github/workflows/fetch.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/fetch.yml b/.github/workflows/fetch.yml
index e67c95f6..4faac05a 100644
--- a/.github/workflows/fetch.yml
+++ b/.github/workflows/fetch.yml
@@ -3,7 +3,7 @@
 name: Merge upstream branches
 on:
   schedule:
-    - cron:  '* * * * *'
+    - cron:  '5 * * * *'
   workflow_dispatch:
 jobs:
   merge:
@@ -17,7 +17,8 @@ jobs:
           git clone https://${{ secrets.PERSONAL_TOKEN }}@github.com/Ryananana/sing-box.git tmp
           cd tmp
           git remote add upstream https://github.com/SagerNet/sing-box.git
-          git reset .
-          git fetch upstream
+          git fetch --all
+          git reset --hard origin/dev-next
+          git pull
           git merge upstream/dev-next
           git push origin dev-next