Skip to content

Commit 5138f0e

Browse files
CI sync.yml: changed to rebase, ignore fail
Signed-off-by: DreamConnected <1487442471@qq.com>
1 parent 73c0a94 commit 5138f0e

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

.github/workflows/sync.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ jobs:
1919
pr_title: "Merge upstream branch 'main'"
2020
pr_message: "Merge branch 'lxc:main' into main"
2121
auto_merge: false
22+
merge_method: rebase
23+
ignore_fail: true

0 commit comments

Comments
 (0)