Update sync.yml

OneDay-OneAlgorithm · Jul 10, 2024 · 02b669b · 02b669b
1 parent 2c7e586
commit 02b669b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git 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
-