From 044fc9f7b364eee8e0204153d87659d0d1f35b36 Mon Sep 17 00:00:00 2001 From: beom Date: Thu, 5 Dec 2024 18:27:49 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20git-push.yml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/git-push.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/git-push.yml b/.github/workflows/git-push.yml index 1297eee..e55d118 100644 --- a/.github/workflows/git-push.yml +++ b/.github/workflows/git-push.yml @@ -23,6 +23,11 @@ jobs: run: | git config --global user.email "${{ secrets.OFFICIAL_ACCOUNT_EMAIL }}" git config --global user.name "${{ github.actor }}" + - name: Fetch and merge remote changes + run: | + git remote add destination https://github.com/seung365/alphamail-frontend.git + git fetch destination + git merge destination/main --allow-unrelated-histories - name: Pushes to another repository uses: cpina/github-action-push-to-another-repository@main env: @@ -35,4 +40,3 @@ jobs: user-name: ${{ github.actor }} commit-message: 'Syncing main branch' target-branch: main - force: true # 이 옵션 추가