.
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
6cedcd07ec
commit
a163eec687
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue