another-user
/
batch-example
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 143 Wiki Activity

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

This commit is contained in:
giles 2023-10-18 22:47:14 +01:00
parent 0af874ea47
commit ec5a6690aa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@ -20,7 +20,7 @@ steps:
- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f' - git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
- git checkout -b master - git checkout -b master
- git pull origin master - git pull origin master
- git branch -D product-development #- git branch -D product-development
- git checkout product-development - git checkout product-development
- merge --squash --no-commit --no-ff --strategyoption=theirs format-branch - merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
environment: environment: