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

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

Reviewed-on: #51
This commit is contained in:
giles 2023-10-18 22:20:08 +00:00
parent e4fc805bbc d6f99ccb1f
commit 3dee798410
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.drone.yml
View File

@ -17,12 +17,12 @@ steps:
- format-branch - format-branch
image: alpine/git:latest image: alpine/git:latest
commands: commands:
- 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 -b product-development - git checkout -b product-development
- 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