.

2023-10-18 23:15:44 +00:00 · 2023-10-19 00:14:57 +01:00
1 changed files with 2 additions and 2 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -22,8 +22,8 @@ steps:
    - git pull origin master
    # - git branch -D 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:
    GIT_PASSWORD:
      from_secret: GIT_PASSWORD
Author	SHA1	Message	Date
giles	615c769cc5	.	2023-10-18 23:15:44 +00:00
giles	a163eec687	. continuous-integration/drone/push Build is passing Details	2023-10-19 00:14:57 +01:00