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