TTokenySpace
返回 Skills 列表

resolving-merge-conflicts

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

下载 ZIP 查看源码
0

安装到 Tokeny（自动）

下载 ZIP
安装"resolving-merge-conflicts"技能
技能信息：
- 名称: resolving-merge-conflicts
- 标识: resolving-merge-conflicts
- 描述: Use when you need to resolve an in-progress git merge/rebase conflict.
- 版本: 697d4ce
下载地址：
https://www.tokeny.space/api/skills/resolving-merge-conflicts/download
继续

复制上方内容到 Tokeny 客户端并在会话中发送即可自动安装；也可直接 下载 ZIP并拖动到技能窗口安装。

SKILL.md

  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.

评论

加载中…