From a0172a5d2d4e77d101512fba6e6e423d32c6c7c2 Mon Sep 17 00:00:00 2001 From: giles Date: Thu, 19 Oct 2023 00:40:55 +0100 Subject: [PATCH] 77 --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2f090ba..113555c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,8 +23,9 @@ 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 checkout format-branch **/*.* + #- git merge --squash --no-commit --strategy-option=theirs format-branch + - git checkout format-branch **/*.* + - git log -n 3 environment: GIT_PASSWORD: from_secret: GIT_PASSWORD