跳到正文
cccskills
免费在 GitHub 公开

resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

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

egma-ai/egma
查看安装方法

包含的文件（2）

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

SKILL.md（原文）

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

<!-- path-routing:start -->

Repository configuration overrides this skill's default planning paths. If a Planning root is defined, resolve CONTEXT.md, docs/adr/, docs/agents/, .scratch/, and .out-of-scope/ from that root. Skill-local paths remain unchanged.

<!-- path-routing:end -->

  1. See the current state of the merge/rebase. Check git history, and the conflicting files.

  2. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.

  3. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.

  4. Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.

  5. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

评价

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

评论

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

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

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

0 / 1000 字

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

同一仓库的技能

ask-matt

免费

Ask which skill or flow fits your situation. A router over the skills in this repo.

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

egma-ai/egma1452026年9月30日 更新

bro

免费

Re-explain the previous assistant message in a much simpler way — for when the reply made you go 'bro what'. Use /bro to get a plain-language version of the last answer.

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

egma-ai/egma1452026年9月30日 更新

code-review

免费

Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes — Standards (does the code follow this repo's documented coding standards?) and Spec (does the code match what the originating issue/spec asked for?). Runs both reviews in parallel sub-agents and reports them side by side. Use when the user wants to review a branch, a PR, work-in-progress changes, or asks to "review since X".

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

egma-ai/egma1452026年9月30日 更新

codebase-design

免费

Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find deepening opportunities, decide where a seam goes, make code more testable or AI-navigable, or when another skill needs the deep-module vocabulary.

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

egma-ai/egma1452026年9月30日 更新

coordinate-implementation

免费

Drive one ticketed effort through parallel implementation, independent review, serial integration, and one open pull request.

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

egma-ai/egma1452026年9月30日 更新

diagnosing-bugs

免费

Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing/slow.

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

egma-ai/egma1452026年9月30日 更新

查看 egma-ai 的全部技能

报告此技能的问题