diff --git a/.github/workflows/merge-dev-into-main.yml b/.github/workflows/merge-dev-into-main.yml index 18d188b..f5d109a 100644 --- a/.github/workflows/merge-dev-into-main.yml +++ b/.github/workflows/merge-dev-into-main.yml @@ -23,12 +23,12 @@ jobs: - name: Run Tests run: ./gradlew test - - name: Merge Dev into Main + - name: Merge Development branch into Main if: success() run: | git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git checkout main git pull origin main - git merge --no-ff dev -m "Merge dev into main" + git merge --no-ff development -m "Merge dev into main" git push origin main \ No newline at end of file