跳到正文
FunCoding

fix-merge-conflicts

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

Star
11,087
最近提交
2026年10月13日

cursor-team-kit/skills/fix-merge-conflicts/SKILL.md

在 GitHub 上查看

Fix merge conflicts

Trigger

Branch has unresolved merge conflicts and needs a reliable path to a buildable state.

Workflow

  1. Detect all conflicting files from git status and conflict markers.
  2. Resolve each conflict with minimal, correctness-first edits.
  3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
  4. Regenerate lockfiles with package manager tools instead of hand-editing.
  5. Run compile, lint, and relevant tests.
  6. Stage resolved files and summarize key decisions.

Guardrails

  • Keep changes minimal and readable.
  • Do not leave conflict markers in any file.
  • Avoid broad refactors while resolving conflicts.
  • Do not push or tag during conflict resolution.

Output

  • Files resolved
  • Notable resolution choices
  • Build/test outcome

相似的 Skill

test-driven-development

OBobra/superpowers298k近 7 天新增 2,205 个 star

migrate-to-shoehorn

MAmattpocock/skills288k近 7 天新增 8,502 个 star

agent-runtime-gateway-smoke-test

AFaffaan-m/ECC278k近 7 天新增 3,369 个 star

精选

accessibility

审计 Web、iOS、Android 的无障碍合规,支持键盘导航与屏幕阅读器。

AFaffaan-m/ECC278k近 7 天新增 3,369 个 star

ai-regression-testing

AFaffaan-m/ECC278k近 7 天新增 3,369 个 star

官方

firecrawl-build-interact

FIfirecrawl/firecrawl191k近 7 天新增 1,648 个 star