(conflicts)
| 2328 | |
| 2329 | |
| 2330 | def fmt_conflicts(conflicts): |
| 2331 | if not conflicts: |
| 2332 | print("✅ 没有未决冲突") |
| 2333 | return |
| 2334 | print(f"⚠️ 发现 {len(conflicts)} 处冲突标注：\n") |
| 2335 | for c in conflicts: |
| 2336 | print(f" {c['path']}:{c['line']} ({c['title']})") |
| 2337 | print(" --- 冲突块 ---") |
| 2338 | for line in c["block"].split("\n"): |
| 2339 | print(f" {line}") |
| 2340 | print() |
| 2341 | |
| 2342 | |
| 2343 | def fmt_to_update(items): |