Merge branch 'master' into product-development

Merge pull request 'product-development' (#53 ) from product-development into master
2023-10-18 23:13:05 +00:00 · 2023-10-18 23:12:58 +00:00 · 2023-10-18 22:38:26 +00:00 · 2023-10-18 22:33:24 +00: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	23a0f20964	Merge branch 'master' into product-development	2023-10-18 23:13:05 +00:00
giles	083e62ff4b	Merge branch 'master' into product-development continuous-integration/drone/push Build is passing Details	2023-10-18 23:12:58 +00:00
giles	61896dd077	Merge pull request 'product-development' (#53 ) from product-development into master continuous-integration/drone/push Build is failing Details Reviewed-on: #53	2023-10-18 22:38:26 +00:00
giles	99f117ef26	Merge pull request 'product-development' (#52 ) from product-development into master continuous-integration/drone/push Build is passing Details Reviewed-on: #52	2023-10-18 22:33:24 +00:00