test: auto merge 파일 수정

boostcampwm-2024 · Nov 8, 2024 · b002c4b · b002c4b
1 parent 8df574e
commit b002c4b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.github/workflows/merge-to-main.yml b/.github/workflows/merge-to-main.yml
@@ -12,10 +12,12 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Fetch all branches
-        run: git fetch origin +refs/heads/*:refs/remotes/origin/* 
+        run: git fetch origin +refs/heads/*:refs/remotes/origin/dev
 
       - name: Merge dev to main
         run: |
+          git fetch origin
           git checkout main
+          git pull origin main
           git merge origin/dev --no-ff --no-edit
           git push origin main