From c0fd85d0d9ed677aff27815b0d0c49ef5682aa6e Mon Sep 17 00:00:00 2001
From: kanguk <lm0828@naver.com>
Date: Sat, 2 Nov 2024 03:14:30 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=90=EB=8F=99=EB=B0=B0=ED=8F=AC=20?=
 =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=EC=A4=91=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

name: 레포지토리 최신화
on:
  workflow_dispatch:
  schedule:
  - cron: "0 8 * * *" #Runs at 8:00 UTC(5:00 in Korea) every day.

jobs:
  merge:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - name: Merge upstream
        run: |
          git config --global user.name 'kanguk01'
          git config --global user.email 'lm0828@naver.com'
          # "git checkout master" is unnecessary, already here by default
          git pull --unshallow  # this option is very important, you would get
                                # complains about unrelated histories without it.
                                # (but actions/checkout@v2 can also be instructed
                                # to fetch all git depth right from the start)
          git remote add upstream https://github.com/kakao-tech-campus-2nd-step3/Team3_FE.git
          git fetch upstream
          git checkout master
          git merge -Xtheirs upstream/master
          git push origin master
---
 .github/workflows/deploy.yml | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index beef6c5..8b13789 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,25 +1 @@
-name: 레포지토리 최신화
-on:
-  workflow_dispatch:
-  schedule: 
-  - cron: "0 8 * * *" #Runs at 8:00 UTC(5:00 in Korea) every day.
 
-jobs:
-  merge:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Merge upstream
-        run: |
-          git config --global user.name 'kanguk01'
-          git config --global user.email 'lm0828@naver.com'
-          # "git checkout master" is unnecessary, already here by default
-          git pull --unshallow  # this option is very important, you would get
-                                # complains about unrelated histories without it.
-                                # (but actions/checkout@v2 can also be instructed
-                                # to fetch all git depth right from the start)
-          git remote add upstream https://github.com/kakao-tech-campus-2nd-step3/Team3_FE.git
-          git fetch upstream
-          git checkout master
-          git merge -Xtheirs upstream/master
-          git push origin master