fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
- License 许可
- MIT
- 最近更新
- 2026-11-13
- Stars
- ★ 4.3k
- Forks
- 397
01 前言 Front Matter
- name
- fix-merge-conflicts
- description
- Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
03 SKILL.md 正文
Fix merge conflicts
Trigger
Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
Workflow
- Detect all conflicting files from git status and conflict markers.
- Resolve each conflict with minimal, correctness-first edits.
- Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
- Regenerate lockfiles with package manager tools instead of hand-editing.
- Run compile, lint, and relevant tests.
- 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
04 同仓库更多 Skills
why
Use for 'why does X work this way', 'why we picked Y', design rationale, regressions, postmortems, or data-backed thresholds. Discovers available MCPs and queries each evidence category (source control, issue tracker, long-form docs, real-time chat, infrastructure observability, error tracking, product analytics warehouse) in parallel, then returns a cited read on decisions and tradeoffs. Use how for runtime behavior.
what-did-i-get-done
Summarize authored commits over a user-specified time period into a concise update
unslop
Cut AI tells from any writing.
typescript-best-practices
TypeScript best practices. Use when reading or editing any .ts or .tsx file.
thermos
Launch both thermo-nuclear review subagents in parallel, then synthesize their findings. Use for thermos, double thermo review, or combined bug/security and code-quality branch audits.
thermo-nuclear-review
Comprehensive security and correctness audit of a branch's changes. Use for thermo nuclear, thermonuclear, or deep review requests, or branch/PR diff audits focused on bugs, breaking changes, security issues, devex regressions, and feature-gate leaks.