[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M6BXR250DVZ9JQAT6D3N2F92":3,"skill-same:01M6BXR250DVZ9JQAT6D3N2F92":57},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":16,"categories":17,"keywords":18,"publishedAt":29,"linkOnly":30,"markdownContent":31,"markdownBody":32,"frontMatter":33,"refName":34,"commitSha":35,"skillDirectory":36,"forksCount":37,"repositoryHtmlUrl":38,"repositoryHomepageUrl":39,"ownerHtmlUrl":40,"ownerBlogUrl":12,"ownerDescription":41,"updatedAt":42,"install":43,"resources":56},"01M6BXR250DVZ9JQAT6D3N2F92","resolving-merge-conflicts",null,"Resolve an in-progress Git merge or rebase by preserving both sides' intent and verifying the result.","nodetool-ai\u002Fnodetool","nodetool-ai","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F164873569?v=4","01M6BXPFDW36K9K1MR8ZH63HG2","nodetool.ai","01M6BXPFJ893XM219GQN60B0WK",635,"AGPL-3.0","https:\u002F\u002Fgithub.com\u002Fnodetool-ai\u002Fnodetool\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",[],[19,20,21,22,23,24,25,26,27,28],"resolving merge conflicts","merge","merge conflicts","conflicts","git merge","git","rebase","intent","progress","result","2026-11-10 10:12:30",false,"---\nname: resolving-merge-conflicts\ndescription: \"Resolve an in-progress Git merge or rebase by preserving both sides' intent and verifying the result.\"\n---\n\n# Resolve merge conflicts\n\nFinish the in-progress merge or rebase while preserving the intent of both sides\nand unrelated local work.\n\n1. Inspect Git status, history, the operation in progress, and unmerged paths.\n2. Read both versions and relevant commit, PR, or issue context. Resolve by the\n   intended behavior, not by choosing an entire side indiscriminately.\n3. Resolve compatible changes directly. If the intents conflict and the user's\n   goal does not settle the choice, prepare the alternatives and ask about that\n   hunk while continuing independent resolutions. Do not invent behavior.\n4. Run the [mandatory post-change verification](..\u002F..\u002F..\u002FAGENTS.md#mandatory-post-change-verification)\n   for code changes and repair failures caused by the resolution.\n5. Stage only the resolved files belonging to the operation. Inspect the index\n   for unrelated changes before continuing the merge or rebase. Repeat until the\n   operation is complete, then report its status and verification results.\n\nDo not abort or discard either side's work unless the user requests it. Do not\nstage every working-tree file as a shortcut. Respect a request to leave the\nresolution uncommitted for review.\n","# Resolve merge conflicts\n\nFinish the in-progress merge or rebase while preserving the intent of both sides\nand unrelated local work.\n\n1. Inspect Git status, history, the operation in progress, and unmerged paths.\n2. Read both versions and relevant commit, PR, or issue context. Resolve by the\n   intended behavior, not by choosing an entire side indiscriminately.\n3. Resolve compatible changes directly. If the intents conflict and the user's\n   goal does not settle the choice, prepare the alternatives and ask about that\n   hunk while continuing independent resolutions. Do not invent behavior.\n4. Run the [mandatory post-change verification](..\u002F..\u002F..\u002FAGENTS.md#mandatory-post-change-verification)\n   for code changes and repair failures caused by the resolution.\n5. Stage only the resolved files belonging to the operation. Inspect the index\n   for unrelated changes before continuing the merge or rebase. Repeat until the\n   operation is complete, then report its status and verification results.\n\nDo not abort or discard either side's work unless the user requests it. Do not\nstage every working-tree file as a shortcut. Respect a request to leave the\nresolution uncommitted for review.\n",{"name":5,"description":7},"main","c7226baa82daca42a19a5855c116544f97aa8bac",".agents\u002Fskills\u002Fresolving-merge-conflicts",91,"https:\u002F\u002Fgithub.com\u002Fnodetool-ai\u002Fnodetool","https:\u002F\u002Fnodetool.ai\u002F","https:\u002F\u002Fgithub.com\u002Fnodetool-ai","No-code AI development","2026-11-15 03:27:49",{"source":8,"skillName":5,"commands":44,"prompt":54,"zipAvailable":55},[45,48,51],{"tool":46,"command":47},"npx","npx skills add nodetool-ai\u002Fnodetool --skill resolving-merge-conflicts",{"tool":49,"command":50},"bunx","bunx skills add nodetool-ai\u002Fnodetool --skill resolving-merge-conflicts",{"tool":52,"command":53},"pnpm","pnpm dlx skills add nodetool-ai\u002Fnodetool --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fnodetool-ai\u002Fnodetool\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[],[58,67,105,135,150,166],{"skillNo":59,"name":60,"nameZh":6,"description":61,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":62,"licenseFileUrl":6,"sourceHtmlUrl":63,"categories":64,"keywords":65,"publishedAt":66},"01M742MX3Y2ZYK884ZXTRFKB9P","humanizer","Rewrite AI-sounding text so it reads like the writer without changing what it says.\nUse when editing or reviewing prose for AI tells: not-X-but-Y contrasts, one-line\nclosers, staged openers, forced triads, dashes everywhere, inflated claims, sales\nlanguage, stock AI words, bold labels, or filler.","MIT","https:\u002F\u002Fgithub.com\u002Fnodetool-ai\u002Fnodetool\u002Fblob\u002Fmain\u002F.agents\u002Fskills\u002Fhumanizer\u002FSKILL.md",[],[],"2026-11-11 15:11:14",{"skillNo":68,"name":69,"nameZh":6,"description":70,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":71,"categories":72,"keywords":83,"publishedAt":29},"01M6BY4D93R0Q9400ZHJ04DXP1","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.","https:\u002F\u002Fgithub.com\u002Fnodetool-ai\u002Fnodetool\u002Fblob\u002Fmain\u002Fplugins\u002Fchatgpt\u002Fnodetool\u002Fskills\u002Fnodetool\u002FSKILL.md",[73,78],{"categoryNo":74,"categoryName":75,"taxonomyType":76,"taxonomyTypeDesc":77},"01JBSEEDCAT000000000000023","Skill与智能体开发","SCENARIO","使用场景",{"categoryNo":79,"categoryName":80,"taxonomyType":81,"taxonomyTypeDesc":82},"01JBSEEDCAT000000000000030","开发工程师","PROFESSION","适用职业",[69,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104],"MCP","Media","workflows","when","generation","media generation","with","visual","use","collections","for","node","work","debug","graph","validate","assets","run","server","mcp server","workflow",{"skillNo":106,"name":107,"nameZh":6,"description":108,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":109,"categories":110,"keywords":114,"publishedAt":29},"01M6BY4AEB05ZPBRVD078ATR2H","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\u002Fwan-2.6\u002Ftext-to-video, alibaba\u002Fwan-2.6\u002Fimage-to-video, wan-video\u002Fwan-2.6-t2v, wan-video\u002Fwan-2.6-i2v, wan-video\u002Fwan2.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.","https:\u002F\u002Fgithub.com\u002Fnodetool-ai\u002Fnodetool\u002Fblob\u002Fmain\u002Fpackages\u002Fsystem-skills\u002Fwan-2-6-prompting\u002FSKILL.md",[111],{"categoryNo":112,"categoryName":113,"taxonomyType":76,"taxonomyTypeDesc":77},"01JBSEEDCAT000000000000016","图像与多媒体",[115,116,117,118,119,120,121,95,122,123,124,125,126,127,128,129,130,131,132,133,134],"prompting","wan 2 6 prompting","line","expansion","input","image-to-video","text-to-video","route","only","mode","time","flash","Budget","generate","text","image","animate","model","Audio","Video",{"skillNo":136,"name":137,"nameZh":6,"description":138,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":139,"categories":140,"keywords":143,"publishedAt":29},"01M6BY47T4748ZG5ZMTAR97ZWZ","video-workflow","Build a reusable NodeTool video workflow for batches or repeated inputs. For a single finished piece, use a storyboard skill.","https:\u002F\u002Fgithub.com\u002Fnodetool-ai\u002Fnodetool\u002Fblob\u002Fmain\u002Fpackages\u002Fsystem-skills\u002Fvideo-workflow\u002FSKILL.md",[141,142],{"categoryNo":112,"categoryName":113,"taxonomyType":76,"taxonomyTypeDesc":77},{"categoryNo":74,"categoryName":75,"taxonomyType":76,"taxonomyTypeDesc":77},[104,144,134,145,146,147,148,92,149,69,94],"video workflow","reusable","storyboard","build","batches","single",{"skillNo":151,"name":152,"nameZh":6,"description":153,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":154,"categories":155,"keywords":157,"publishedAt":29},"01M6BY4587N2SYN315SXGEMZC3","video-clone","Analyze a reference video and recreate its shot structure with a new product or cast in NodeTool.","https:\u002F\u002Fgithub.com\u002Fnodetool-ai\u002Fnodetool\u002Fblob\u002Fmain\u002Fpackages\u002Fsystem-skills\u002Fvideo-clone\u002FSKILL.md",[156],{"categoryNo":112,"categoryName":113,"taxonomyType":76,"taxonomyTypeDesc":77},[158,159,134,90,160,161,69,162,163,164,165],"clone","video clone","cast","new","analyze","product","structure","reference",{"skillNo":167,"name":168,"nameZh":6,"description":169,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":170,"categories":171,"keywords":173,"publishedAt":29},"01M6BY4257C2KQYYMD9EK6DK8E","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.","https:\u002F\u002Fgithub.com\u002Fnodetool-ai\u002Fnodetool\u002Fblob\u002Fmain\u002Fpackages\u002Fsystem-skills\u002Fvideo-audio-continuity\u002FSKILL.md",[172],{"categoryNo":112,"categoryName":113,"taxonomyType":76,"taxonomyTypeDesc":77},[174,134,133,175,176,177,178,179,180,181,182,183,184,87,185,186,132,187,188,189,190],"video audio continuity","continuity","write","why","back","veo 3","at","cut","later","across","filter","generated","how to","mix","design","boundary","how"]