Revert "fix(opencode): revert .github conflict resolution back to --ours"

This reverts commit 3413d1f.

Author: huangdihd

.github/workflows/opencode.yml

@@ -122,22 +122,25 @@ jobs:
             # support, cache fixes, ...) in areas the fork didn't touch flow in for free.
             #
             # Only directly CONFLICTING hunks are resolved here, split by ownership:
-            #   * Fork-owned CI/docs (.github/**, README, ...) keep OURS. The fork
-            #     is a heavy rewrite (ReSukiSU branding, ccache download-once,
-            #     model-link table, DWC3, KSUN removal, t.me links). Resolving
-            #     HERE lets the workflow commit a real 2-parent merge commit so
-            #     upstream ancestry is preserved and merge-base advances.
+            #   * Fork-owned CI/docs (.github/**, README, ...) are LEFT CONFLICTED
+            #     so the opencode agent can intelligently merge upstream CI
+            #     improvements while preserving fork-specific features (ReSukiSU
+            #     branding, ccache download-once, model-link table, OOS naming,
+            #     DWC3, KSUN removal, t.me links, etc.) per guidelines.txt.
             #   * Everything else (device configs, manifests, kernel sources) takes
             #     UPSTREAM; sanitize.py below re-applies the deterministic fork
             #     transforms (uname -> OP-RESUKISU, AnyKernel3 URL, oos* naming).
             git ls-files -u 2>/dev/null | awk '{print $4}' | sort -u | while IFS= read -r f; do
               [ -z "$f" ] && continue
               case "$f" in
                 .github/*|README.md|compatibility.md|LICENSE)
-                  git checkout --ours -- "$f" 2>/dev/null || true
-                  git add -- "$f" 2>/dev/null || true
+                  # CI/docs: skip auto-resolve. Leave conflicts for the agent
+                  # so it can merge upstream improvements while keeping fork
+                  # customizations per guidelines.txt.
                   ;;
                 *)
+                  # Device configs, manifests, kernel sources: take UPSTREAM;
+                  # sanitize.py below re-applies deterministic fork transforms.
                   git checkout --theirs -- "$f" 2>/dev/null || git rm -f --quiet "$f" 2>/dev/null || true
                   git add -- "$f" 2>/dev/null || true
                   ;;