.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
giles 2023-10-18 22:50:53 +01:00
parent 1eb1215362
commit a4600dc99a
1 changed files with 1 additions and 1 deletions

View File

@ -22,7 +22,7 @@ steps:
- git pull origin master
# - git branch -D product-development
- git checkout -b product-development
- git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
- git merge --squash --no-commit --no-ff --strategy-option=theirs format-branch
environment:
GIT_PASSWORD:
from_secret: GIT_PASSWORD