Fix pull parameter

This commit is contained in:
DarkFighterLuke
2024-05-14 19:18:01 +02:00
parent 00eeff552c
commit 9635a49c06
+1 -1
View File
@@ -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"