.

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 · 2023-10-18 22:48:20 +01:00 · 2023-10-18 22:47:14 +01:00
2 changed files with 4 additions and 4 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -20,9 +20,9 @@ steps:
    - 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 product-development
-    - merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
+    # - git branch -D product-development
+    - git checkout -b product-development
+    - git merge --squash --no-commit --strategy-option=theirs format-branch
  environment:
    GIT_PASSWORD:
      from_secret: GIT_PASSWORD
--- a/equipment-model.a.yml
+++ b/equipment-model.a.yml
@ -135,7 +135,7 @@
      - Required: '0'
      - ApproveSignatureTemplateName: null
      - RevertSignatureTemplateName: null
-      - Description: Confirmation by the author of the recipe that it is ready for review.
+      - Description: Confirmation by the author of the recipe that it is ready for review..
    - RecipeApprovalStep:
      - Name: Review Recipe
      - Id: '-3'
Author	SHA1	Message	Date
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
giles	882deba967	. continuous-integration/drone/push Build is failing Details	2023-10-18 22:48:20 +01:00
giles	ec5a6690aa	. continuous-integration/drone/push Build is failing Details	2023-10-18 22:47:14 +01:00
giles	0af874ea47	... continuous-integration/drone/push Build is failing Details	2023-10-18 22:45:42 +01:00
giles	1ff3960cc1	Merge pull request 'uuuuu' (#46 ) from product-development into master Reviewed-on: #46	2023-10-18 21:40:59 +00:00
giles	15f97007a1	Merge pull request 'uuuuu' (#46 ) from product-development into master continuous-integration/drone/push Build is passing Details Reviewed-on: #46	2023-10-18 21:40:51 +00:00
giles	9020d4b229	Merge pull request '1' (#45 ) from product-development into master continuous-integration/drone/push Build is passing Details Reviewed-on: #45	2023-10-18 21:20:24 +00:00
giles	7fc34cdf0b	Merge pull request 'product-development' (#44 ) from product-development into master Reviewed-on: #44	2023-10-18 21:17:09 +00:00