Compare commits

..

3 Commits

Author SHA1 Message Date
giles 51a3aeccb7 converted to yml - .. 2023-10-19 00:14:02 +00:00
giles d0a9ce3769 converted to yml - ..
continuous-integration/drone/push Build is passing Details
2023-10-19 00:13:54 +00:00
giles 2d1d2420ca ..
continuous-integration/drone/push Build is passing Details
2023-10-19 01:13:40 +01:00
1 changed files with 0 additions and 11 deletions

View File

@ -18,20 +18,9 @@ steps:
image: alpine/git:latest
commands:
- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
- git log -n 1
- git fetch
#- git checkout master
#- git log -n 1
#- git pull origin master
#- git log -n 1
# - git branch -D product-development
- git checkout -b product-development
#- git merge format-branch
- git log -n 1
- git merge --squash --no-commit --strategy-option=theirs format-branch
# - git checkout format-branch **/*.*
- git status
- git log -n 1
environment:
GIT_PASSWORD:
from_secret: GIT_PASSWORD