From 7d51025edf67eb53bbf2dc9216347852cf1d2046 Mon Sep 17 00:00:00 2001 From: Justin Merrell Date: Mon, 23 Jan 2023 23:36:32 -0500 Subject: [PATCH] Update CD_dev-release.yml --- .github/workflows/CD_dev-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CD_dev-release.yml b/.github/workflows/CD_dev-release.yml index 2a4f936..8377333 100644 --- a/.github/workflows/CD_dev-release.yml +++ b/.github/workflows/CD_dev-release.yml @@ -85,7 +85,8 @@ jobs: git fetch origin git checkout dev-release - git pull origin master-ci --rebase + git pull origin dev-release --rebase + git merge -X theirs master-ci rm -rf LICENSE rm -rf README.md