.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 -b product-development
-    - git merge --squash --no-commit --strategy-option=theirs format-branch
+    - git branch -D product-development
+    - git checkout product-development
+    - merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD

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'