diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b6412cf..7f7ed6e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -75,4 +75,4 @@ jobs: commit: --signoff message: "Update manifest.json" push: "origin HEAD:master" - pull: "-X ours origin HEAD:master" + pull: "--no-rebase -X ours origin HEAD:master"