Fix pull parameter
This commit is contained in:
parent
00eeff552c
commit
9635a49c06
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in New Issue