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