From 6a9ea9fc800b3567369b819a4f7ad0087e416917 Mon Sep 17 00:00:00 2001
From: abyss-s <xyz@inha.edu>
Date: Fri, 22 Nov 2024 04:13:42 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix:=20=EC=9B=8C=ED=81=AC?=
 =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EB=AC=B8=EC=84=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0e1f580..75389fc 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,32 +1,27 @@
-name: Synchronize to forked repo
+name: Update on Main Branch Changes
 on:
   push:
     branches:
       - main
 
 jobs:
-  sync:
-    name: Sync forked repo
+  update:
+    name: Update Development Branch
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout main
         uses: actions/checkout@v4
-        with: 
+        with:
           token: ${{ secrets.BRANCHIFY_TOKEN }}
           fetch-depth: 0
           ref: main
 
-      - name: Add remote-url
+      - name: Create or Update Development Branch
         run: |
-          git remote add forked-repo https://${{ secrets.BRANCHIFY_TOKEN }}@github.com/abyss-s/Branchify_FE.git
-          git config user.name abyss-s
-          git config user.email ${{ secrets.EMAIL }}
-      
-      - name: Push changes to forked-repo 
-        run: |
-          git push -f forked-repo main
-      
-      - name: Clean up
+          git checkout -B dev
+          git merge main
+
+      - name: Push to Development Branch
         run: |
-          git remote remove forked-repo
\ No newline at end of file
+          git push origin dev -f