diff --git a/.github/workflows/CD_dev-release.yml b/.github/workflows/CD_dev-release.yml index 365c5d1..176e28f 100644 --- a/.github/workflows/CD_dev-release.yml +++ b/.github/workflows/CD_dev-release.yml @@ -82,6 +82,9 @@ jobs: git checkout dev-release git pull origin dev-release --rebase + + git checkout master-ci installer.sh + git merge -X theirs origin/master-ci rm -rf LICENSE