From cb43f090b11a3399cdf3da91dee93f7c9df62931 Mon Sep 17 00:00:00 2001
From: "Mechak (me-shak)" <88886274+mechakdotdev@users.noreply.github.com>
Date: Sat, 23 Nov 2024 20:38:51 +0000
Subject: [PATCH] Correct branch name in merge-dev-int-main workflow (#20)

---
 .github/workflows/merge-dev-into-main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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