跳到正文
cccskills
免费在 GitHub 公开

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.

中文简介正在准备中。当前显示原文说明。

查看安装方法

包含的文件(2)

  • SKILL.md1.3 KB
  • agents/openai.yaml113 B

SKILL.md(原文)

安装前可以查看交给 AI 代理的指令内容。

Resolve Merge Conflicts

  1. Inspect the current Git state, the operation in progress, its goal, and every conflicting file.
  2. Reconstruct each side's intent from the code, nearby tests, history, commit messages, and linked work items that are available and useful.
  3. Resolve each hunk by preserving compatible intent. Where intents conflict, prefer the merge's stated goal and current repository contracts; avoid inventing unrelated behavior.
  4. Run focused checks for the affected surface, then broader checks when risk or repository guidance warrants them.
  5. 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.

评价

还没有评价。欢迎分享你的使用感受。

评论

无需登录即可发表。欢迎分享使用感受、提问,或说明在哪些环境下无法运行。

还没有评论。来写第一条吧。

提交后会立即公开。请勿填写邮箱、电话等个人信息。URL 最多 2 个。

0 / 1000 字

此表单受 reCAPTCHA 保护,适用 Google 的隐私权政策和服务条款。

同一仓库的技能

Create or review an AGENTS.md file so coding agents get stable repo-local instructions: environment setup, testing, style, security boundaries, PR policy, and handoff rules. Use when a repo lacks durable agent guidance or when a custom harness needs a predictable context file.

中文简介正在准备中。当前显示原文说明。

stevesolun/ctx5882026年10月15日 更新

ask-matt

免费

Recommend the smallest Matt Pocock skill or short skill sequence that fits the user's current goal.

中文简介正在准备中。当前显示原文说明。

stevesolun/ctx5882026年10月15日 更新

cavecrew

免费

Decision guide for delegating to caveman-style subagents. Tells the main thread WHEN to spawn `cavecrew-investigator` (locate code), `cavecrew-builder` (1-2 file edit), or `cavecrew-reviewer` (diff review) instead of doing the work inline or using vanilla `Explore`. Subagent output is caveman-compressed so the tool-result injected back into main context is ~60% smaller — main context lasts longer across long sessions. Trigger: "delegate to subagent", "use cavecrew", "spawn investigator/builder/reviewer", "save context", "compressed agent output".

中文简介正在准备中。当前显示原文说明。

stevesolun/ctx5882026年10月15日 更新

caveman

免费

Ultra-compressed communication mode. Cuts token usage ~75% by dropping filler, articles, and pleasantries while keeping full technical accuracy. Use when user says "caveman mode", "talk like caveman", "use caveman", "less tokens", "be brief", or invokes /caveman.

中文简介正在准备中。当前显示原文说明。

stevesolun/ctx5882026年10月15日 更新

caveman

免费

Ultra-compressed communication mode. Cuts token usage ~75% by speaking like caveman while keeping full technical accuracy. Supports intensity levels: lite, full (default), ultra, wenyan-lite, wenyan-full, wenyan-ultra. Use when user says "caveman mode", "talk like caveman", "use caveman", "less tokens", "be brief", or invokes /caveman. Also auto-triggers when token efficiency is requested.

中文简介正在准备中。当前显示原文说明。

stevesolun/ctx5882026年10月15日 更新

Ultra-compressed commit message generator. Cuts noise from commit messages while preserving intent and reasoning. Conventional Commits format. Subject ≤50 chars, body only when "why" isn't obvious. Use when user says "write a commit", "commit message", "generate commit", "/commit", or invokes /caveman-commit. Auto-triggers when staging changes.

中文简介正在准备中。当前显示原文说明。

stevesolun/ctx5882026年10月15日 更新

查看 stevesolun 的全部技能

报告此技能的问题