Merge pull request 'product-development' (#47 ) from product-development into master

Reviewed-on: #47
2023-10-18 21:52:31 +00:00 · 2023-10-18 21:52:23 +00:00 · 2023-10-18 21:51:34 +00:00 · 2023-10-18 22:51:23 +01:00 · 2023-10-18 22:50:53 +01:00 · 2023-10-18 22:50:24 +01:00
1 changed files with 2 additions and 2 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -22,7 +22,7 @@ steps:
    - git pull origin master
    # - git branch -D product-development
    - git checkout -b product-development
-    - merge --squash --no-commit --no-ff --strategyoption=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	ec976da303	Merge pull request 'product-development' (#47 ) from product-development into master Reviewed-on: #47	2023-10-18 21:52:31 +00:00
giles	226c04bed7	Merge pull request 'product-development' (#47 ) from product-development into master continuous-integration/drone/push Build is passing Details Reviewed-on: #47	2023-10-18 21:52:23 +00:00
giles	eae4a75f0a	.	2023-10-18 21:51:34 +00:00
giles	a15ea1b3ae	. continuous-integration/drone/push Build is passing Details	2023-10-18 22:51:23 +01:00
giles	a4600dc99a	. continuous-integration/drone/push Build is failing Details	2023-10-18 22:50:53 +01:00
giles	1eb1215362	. continuous-integration/drone/push Build is failing Details	2023-10-18 22:50:24 +01:00