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..."
           }