Compare commits
5 Commits
b3f453807d
...
11647339af
Author | SHA1 | Date |
---|---|---|
giles | 11647339af | |
giles | d6f99ccb1f | |
giles | c3e6dc350a | |
giles | f4e4081442 | |
giles | e4fc805bbc |
|
@ -17,12 +17,12 @@ steps:
|
|||
- format-branch
|
||||
image: alpine/git:latest
|
||||
commands:
|
||||
- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
|
||||
- git checkout -b master
|
||||
- git pull origin master
|
||||
#- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
|
||||
#- git checkout -b master
|
||||
#- git pull origin master
|
||||
# - git branch -D 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:
|
||||
GIT_PASSWORD:
|
||||
from_secret: GIT_PASSWORD
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue