From 5dae6108fbea5bd41e8118c52a7302aed13031b4 Mon Sep 17 00:00:00 2001 From: OG T Date: Fri, 17 Apr 2026 13:17:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(cd):=20rebase=20=E8=A1=9D=E7=AA=81=E6=94=B9?= =?UTF-8?q?=20-X=20theirs=EF=BC=8Ckustomization.yaml=20=E6=B0=B8=E9=81=A0?= =?UTF-8?q?=E6=8E=A1=E7=94=A8=E7=95=B6=E6=AC=A1=20image=20tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 4.6 --- .gitea/workflows/cd.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 7e162ea4..54a00db2 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -408,8 +408,9 @@ jobs: git remote remove gitea 2>/dev/null || true git remote add gitea http://wooo:${GITEA_TOKEN}@192.168.0.110:3001/wooo/awoooi.git # 先 rebase 避免 non-fast-forward (其他 commit 在 CI 期間已推入) + # 2026-04-17 ogt: -X theirs — kustomization.yaml 衝突時採用當次部署的 image tag git fetch gitea main - git rebase gitea/main + git rebase -X theirs gitea/main git push gitea main echo "✅ kustomization.yaml 已 push，等待 ArgoCD sync..." }