From 833fb6845f7793226e66d8d64cb9fcab7a427c10 Mon Sep 17 00:00:00 2001 From: bushixuanqi <57338301+bushixuanqi@users.noreply.github.com> Date: Wed, 21 Jul 2021 21:42:35 +0800 Subject: [PATCH] Update autoupdatefork.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 强制更新 --- .github/workflows/autoupdatefork.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autoupdatefork.yml b/.github/workflows/autoupdatefork.yml index 9fa5d6425..c10bdd2cc 100644 --- a/.github/workflows/autoupdatefork.yml +++ b/.github/workflows/autoupdatefork.yml @@ -28,5 +28,5 @@ jobs: git remote -v git fetch upstream git checkout master - git merge upstream/master + git merge --no-ff upstream/master git push origin master