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

Reviewed-on: #35
This commit is contained in:
giles 2023-10-18 20:22:06 +00:00
commit 52a1fa2ffd
1 changed files with 2 additions and 2 deletions

View File

@ -36,7 +36,7 @@ steps:
commands:
- git config credential.helper '!f() { sleep 1; echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"; }; f'
- git fetch
- git checkout product-development
- git checkout -b product-development
- git merge format-branch
environment:
GIT_PASSWORD:
@ -52,7 +52,7 @@ steps:
commands:
- git config credential.helper '!f() { sleep 1; echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"; }; f'
- git fetch
- git checkout deployed
- git checkout -b deployed
- git merge master
environment:
GIT_PASSWORD: