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

77
continuous-integration/drone/push Build is passing Details

This commit is contained in:
giles 2023-10-19 00:40:55 +01:00
parent 6c1f128d47
commit a0172a5d2d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.drone.yml
View File

@ -23,8 +23,9 @@ steps:
# - git branch -D product-development # - git branch -D product-development
- git checkout -b product-development - git checkout -b product-development
#- git merge format-branch #- git merge format-branch
- git merge --squash --no-commit --strategy-option=theirs format-branch #- git merge --squash --no-commit --strategy-option=theirs format-branch
#- git checkout format-branch **/*.* - git checkout format-branch **/*.*
- git log -n 3
environment: environment:
GIT_PASSWORD: GIT_PASSWORD:
from_secret: GIT_PASSWORD from_secret: GIT_PASSWORD