resolving-merge-conflicts
Resolve an in-progress Git merge or rebase by preserving both sides' intent and verifying the result.
- License 许可
- AGPL-3.0
- 最近更新
- 2026-11-15
- Stars
- ★ 635
- Forks
- 91
01 前言 Front Matter
- name
- resolving-merge-conflicts
- description
- Resolve an in-progress Git merge or rebase by preserving both sides' intent and verifying the result.
03 SKILL.md 正文
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.
04 同仓库更多 Skills
humanizer
Rewrite AI-sounding text so it reads like the writer without changing what it says. Use when editing or reviewing prose for AI tells: not-X-but-Y contrasts, one-line closers, staged openers, forced triads, dashes everywhere, inflated claims, sales language, stock AI words, bold labels, or filler.
nodetool
Use the NodeTool MCP server to build, validate, run, and debug visual AI workflows, and to work with assets, collections, and jobs. Use when the user mentions NodeTool or asks for a workflow graph, a node, or a media generation run on their NodeTool server.
wan-2-6-prompting
Prompt Alibaba's Wan 2.6 video — text-to-video with a global style line plus timing-bracketed shots, and image-to-video that describes only what changes over time. Covers the shot-mode switch per provider, the prompt budget, negative prompts, motion intensity wording, audio input and prompt expansion. Use whenever the model id names a Wan 2.6 video route (alibaba/wan-2.6/text-to-video, alibaba/wan-2.6/image-to-video, wan-video/wan-2.6-t2v, wan-video/wan-2.6-i2v, wan-video/wan2.6-i2v-flash) on generate_video, animate_image or a TextToVideo node. Not for Wan 2.5 or 2.7, or the Wan 2.6 image routes.
video-workflow
Build a reusable NodeTool video workflow for batches or repeated inputs. For a single finished piece, use a storyboard skill.
video-clone
Analyze a reference video and recreate its shot structure with a new product or cast in NodeTool.
video-audio-continuity
Keep sound continuous across a multi-scene piece cut from generated video — why one clip per scene hard-cuts the audio at every boundary, when to write all the scenes into a single generation instead, the sound-design vocabulary that survives a provider's copyright filter, and how to check the length, the aspect ratio and the mix of what came back. Use when a piece has more than one scene and the video model writes its own audio (Seedance 2, Veo 3, MiniMax H3, Kling 2.6 and later), or when a cut's sound drops out at the shot changes.