From a23e39d9abcf54e8ba55bbbd3c513306e78b56f5 Mon Sep 17 00:00:00 2001 From: Justin Merrell Date: Tue, 24 Jan 2023 01:44:46 -0500 Subject: [PATCH] Update CD_dev-release.yml --- .github/workflows/CD_dev-release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CD_dev-release.yml b/.github/workflows/CD_dev-release.yml index 69ccd4e..7f21b14 100644 --- a/.github/workflows/CD_dev-release.yml +++ b/.github/workflows/CD_dev-release.yml @@ -86,9 +86,13 @@ jobs: git pull origin dev-release --rebase --autostash + git checkout origin/master-ci + git rm installer.sh - git merge -X theirs origin/master-ci --a + git checkout dev-release + + git merge -X theirs master-ci --a rm -rf LICENSE rm -rf README.md