Update CD_dev-release.yml

justinmerrell · justinmerrell · commit b25bea323a62 · 2023-01-24T02:00:56.000-05:00
diff --git a/.github/workflows/CD_dev-release.yml b/.github/workflows/CD_dev-release.yml
@@ -83,9 +83,7 @@ jobs:
 
           git pull origin dev-release
 
-          git checkout dev-release
-
-          git merge -X theirs origin/master-ci
+          git merge master-ci
 
           rm -rf LICENSE
           rm -rf README.md
