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

Merge pull request '.' (#55) from product-development into master
continuous-integration/drone/push Build is passing Details 

Reviewed-on: #55
This commit is contained in:
giles 2023-10-18 23:16:05 +00:00
parent 482d1e2ac2 a163eec687
commit cf1e55363c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.yml
View File

@ -22,8 +22,8 @@ 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
- 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
environment: environment:
GIT_PASSWORD: GIT_PASSWORD:
from_secret: GIT_PASSWORD from_secret: GIT_PASSWORD