resolving-merge-conflicts
Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Use when conflict markers or an interrupted merge/rebase need investigation and resolution.
- License 许可
- MIT
- 所属仓库
- stevesolun/ctx
- 最近更新
- 2026-10-15
- Stars
- ★ 593
- Forks
- 69
01 前言 Front Matter
- name
- resolving-merge-conflicts
- description
- Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Use when conflict markers or an interrupted merge/rebase need investigation and resolution.
02 资源文件 1
- 参考文档agents/openai.yaml113 B
03 SKILL.md 正文
Resolve Merge Conflicts
- Inspect the current Git state, the operation in progress, its goal, and every conflicting file.
- Reconstruct each side's intent from the code, nearby tests, history, commit messages, and linked work items that are available and useful.
- Resolve each hunk by preserving compatible intent. Where intents conflict, prefer the merge's stated goal and current repository contracts; avoid inventing unrelated behavior.
- Run focused checks for the affected surface, then broader checks when risk or repository guidance warrants them.
- Unless the user requested advice or review only, stage resolved files and continue the current merge or rebase when it is safe to do so. Report what was resolved, what was verified, and any remaining uncertainty.
Pause rather than guess when neither intent can be preserved safely. Aborting or restarting can be the correct recovery when the base is wrong, the operation is contaminated, or the user prefers a clean retry; explain the trade-off before taking that destructive step.
04 同仓库更多 Skills
toolbox
Pre/post dev toolbox — named bundles of skills/agents loaded before development work and councils of experts invoked after. Run /toolbox or the toolbox.py CLI to list, activate, initialize, export, import, and validate toolboxes. Invoke at the start or end of a dev session, when setting up a new repo, or when sharing toolboxes with a team.
skill-router
Alive skill router — reads the current project's stack and loads/unloads skills dynamically. Invoke at session start or when project context changes.
repo-stats-autoupdate
Keeps README badge + inline counts in sync with the real number of skills, agents, graph nodes/edges, communities, converted pipelines, and test inventory. Runs automatically on every commit via a git pre-commit hook. Use when the README drifts from reality or before publishing a release.
find-skills
Discover installable agent skills from ctx's shipped Skills.sh catalog, the Skills.sh search API, and the npx skills CLI. Use when a user asks whether a skill exists, wants to add/update a skill, or needs a repeatable procedure for finding candidate skills safely.
no-mistakes
Validate committed feature-branch changes through the no-mistakes pipeline: intent, rebase, review, test, docs, lint, push, PR, and CI. Use when the user asks to run no-mistakes, ship safely, validate before pushing, or gate a change before it reaches upstream.
zoom-out
Tell the agent to zoom out and give broader context or a higher-level perspective. Use when you're unfamiliar with a section of code or need to understand how it fits into the bigger picture.