From 02b669b28cc7b6fb3c996a73afe61ee855739bc3 Mon Sep 17 00:00:00 2001
From: googoo9918 <102513932+googoo9918@users.noreply.github.com>
Date: Wed, 10 Jul 2024 22:12:24 +0900
Subject: [PATCH] Update sync.yml

---
 .github/workflows/sync.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index ecc47da..e14a420 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -37,7 +37,13 @@ jobs:
       - name: Rebase onto second/main from worktree
         run: |
           cd ../worktree
-          git rebase second/main
+          git rebase second/main || git rebase --abort
+
+      - name: Merge second/main from worktree
+        if: failure()
+        run: |
+          cd ../worktree
+          git merge -X ours second/main
 
       - name: Push to second from worktree
         run: |
@@ -46,4 +52,3 @@ jobs:
 
       - name: Clean up worktree
         run: git worktree remove ../worktree
-