From d13da69b7a15b3643b72d6628efa9b0dcf6db8ec Mon Sep 17 00:00:00 2001 From: Ryananana <36809659+Ryananana@users.noreply.github.com> Date: Mon, 20 May 2024 21:12:38 +0800 Subject: [PATCH] Update fetch.yml Signed-off-by: Ryananana <36809659+Ryananana@users.noreply.github.com> --- .github/workflows/fetch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/fetch.yml b/.github/workflows/fetch.yml index e7caf1a8..e67c95f6 100644 --- a/.github/workflows/fetch.yml +++ b/.github/workflows/fetch.yml @@ -17,6 +17,7 @@ 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 merge upstream/dev-next git push origin dev-next