Enhance sync script: auto-resolve CLAUDE.md/README.md conflicts

[vinchacho]

Enhancement

Source: Session feedback feedback/2026-03-02-001-session-upstream-sync.md
Severity: Medium
Component: scripts/sync-upstream.sh

Description

The sync script currently only auto-resolves merge conflicts in cmd/vsp/main.go (import path conflicts). During the 2026-03-02 sync, conflicts also occurred in:

• CLAUDE.md (3 conflict regions: disabled groups list, codebase structure, test counts)
• README.md (1 conflict region: OData bridge URL + reviewer guide link)

The script exited with an error, requiring manual resolution.

Proposed Improvement

Add conflict resolution logic for common doc files:

• CLAUDE.md: Fork (HEAD) typically has richer/more accurate content — prefer HEAD for data sections (test counts, feature lists, detailed structure), but merge new content from upstream
• README.md: Keep vinchacho URLs, incorporate new upstream content (links, badges)

Current Behavior

Script exits with: Merge conflicts could not be auto-resolved

Expected Behavior

Script resolves common doc conflicts automatically, or at minimum provides clearer guidance on what to keep from each side.

---

Auto-generated by VSP feedback loop (/session-wrap)

[toroleapinc]

CLAUDE.md conflict resolution is tricky — especially when multiple sessions might edit it concurrently. claude-brain uses git for this, which gives you standard merge conflict tools. Not perfect for auto-resolution, but at least well-understood. Might be worth looking at how it handles the sync flow for ideas.