.
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
882deba967
commit
1eb1215362
|
@ -20,9 +20,9 @@ steps:
|
|||
- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
|
||||
- git checkout -b master
|
||||
- git pull origin master
|
||||
#- git branch -D product-development
|
||||
# - git branch -D 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:
|
||||
GIT_PASSWORD:
|
||||
from_secret: GIT_PASSWORD
|
||||
|
|
Loading…
Reference in New Issue