ahahah

2023-10-18 23:34:35 +00:00 · 2023-10-19 00:34:21 +01:00
5 changed files with 2212 additions and 3 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -23,7 +23,8 @@ steps:
    # - git branch -D product-development
    - git checkout -b product-development
    #- git merge format-branch
-    - git merge --squash --no-commit --strategy-option=theirs format-branch
+    #- git merge --squash --no-commit --strategy-option=theirs format-branch
+    - git checkout format-branch **/*.* 
  environment:
    GIT_PASSWORD:
      from_secret: GIT_PASSWORD
--- a/equipment-model.a.yml
+++ b/equipment-model.a.yml
--- a/equipment-model.axml
+++ b/equipment-model.axml
--- a/instructions/equipment-model2.a.yml
+++ b/instructions/equipment-model2.a.yml
--- a/instructions/equipment-model2.axml
+++ b/instructions/equipment-model2.axml
Author	SHA1	Message	Date
giles	b6a5b18263	ahahah continuous-integration/drone/push Build is passing Details	2023-10-18 23:34:35 +00:00
giles	afe5437268	ahahah continuous-integration/drone/push Build is passing Details	2023-10-19 00:34:21 +01:00