From 5138f0ede430843b90ed9eb5680b4f913705d965 Mon Sep 17 00:00:00 2001
From: DreamConnected <1487442471@qq.com>
Date: Fri, 7 Nov 2025 18:15:08 +0800
Subject: [PATCH] CI sync.yml: changed to rebase, ignore fail

Signed-off-by: DreamConnected <1487442471@qq.com>
---
 .github/workflows/sync.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index b63549a885..523f82b8c9 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -19,3 +19,5 @@ jobs:
           pr_title: "Merge upstream branch 'main'"
           pr_message: "Merge branch 'lxc:main' into main"
           auto_merge: false
+          merge_method: rebase
+          ignore_fail: true