Agent Skills
› nodetool-ai/nodetool
› resolving-merge-conflicts
resolving-merge-conflicts
GitHub解决 Git 合并或变基冲突，保留双方意图并验证结果。
Trigger Scenarios
Git merge conflict
Git rebase conflict
Install
npx skills add nodetool-ai/nodetool --skill resolving-merge-conflicts -g -y
SKILL.md
Frontmatter
{
"name": "resolving-merge-conflicts",
"description": "Resolve an in-progress Git merge or rebase by preserving both sides' intent and verifying the result."
}
Resolve merge conflicts
Finish the in-progress merge or rebase while preserving the intent of both sides and unrelated local work.
- Inspect Git status, history, the operation in progress, and unmerged paths.
- Read both versions and relevant commit, PR, or issue context. Resolve by the intended behavior, not by choosing an entire side indiscriminately.
- Resolve compatible changes directly. If the intents conflict and the user's goal does not settle the choice, prepare the alternatives and ask about that hunk while continuing independent resolutions. Do not invent behavior.
- Run the mandatory post-change verification for code changes and repair failures caused by the resolution.
- Stage only the resolved files belonging to the operation. Inspect the index for unrelated changes before continuing the merge or rebase. Repeat until the operation is complete, then report its status and verification results.
Do not abort or discard either side's work unless the user requests it. Do not stage every working-tree file as a shortcut. Respect a request to leave the resolution uncommitted for review.
Version History
- 9b979bc Current 2026-09-22 23:26
