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

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

View File

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