[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M6FWCKASHX9WMX3DQAM8Z779":3,"skill-same:01M6FWCKASHX9WMX3DQAM8Z779":57},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":15,"categories":16,"keywords":17,"publishedAt":25,"linkOnly":26,"markdownContent":27,"markdownBody":28,"frontMatter":29,"refName":30,"commitSha":31,"skillDirectory":32,"forksCount":33,"repositoryHtmlUrl":34,"repositoryHomepageUrl":6,"ownerHtmlUrl":35,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":36,"install":37,"resources":50},"01M6FWCKASHX9WMX3DQAM8Z779","merge-resolve",null,"AI-powered git merge conflict resolution","kbarbel640-del\u002Fskills","kbarbel640-del","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F255315490?v=4","01M6CJPPQGCCESXMG3K7BBGQ5J","01M6CJPPX2PB2BCZERFVM2C2B3",1,"MIT","https:\u002F\u002Fgithub.com\u002Fkbarbel640-del\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Flxgicstudios\u002Fai-merge-resolve\u002FSKILL.md",[],[18,19,20,21,22,23,24],"merge","merge resolve","git merge","git","conflict resolution","conflict","resolution","2026-11-10 10:12:30",false,"---\nname: merge-resolve\ndescription: AI-powered git merge conflict resolution\n---\n\n# Merge Resolver\n\nGot merge conflicts? This tool understands both versions and picks the right resolution.\n\n## Quick Start\n\n```bash\nnpx ai-merge-resolve\n```\n\n## What It Does\n\n- Finds all merge conflicts in repo\n- Analyzes both versions semantically\n- Suggests intelligent resolutions\n- Can auto-resolve simple conflicts\n\n## Usage Examples\n\n```bash\n# Resolve all conflicts\nnpx ai-merge-resolve\n\n# Resolve specific file\nnpx ai-merge-resolve .\u002Fsrc\u002Fapi.ts\n\n# Auto-resolve obvious ones\nnpx ai-merge-resolve --auto\n\n# Interactive mode\nnpx ai-merge-resolve --interactive\n```\n\n## How It Works\n\nDoesn't just pick \"theirs\" or \"ours\". Actually reads the code, understands intent, and merges the functionality properly.\n\n## Output\n\n```\nResolving src\u002Futils.ts...\n- Conflict 1: Both added logging → Combined both log statements\n- Conflict 2: Different error messages → Kept more descriptive one\n✓ Resolved 2 conflicts\n```\n\n## Requirements\n\nNode.js 18+. OPENAI_API_KEY required. Must have active merge conflicts.\n\n## License\n\nMIT. Free forever.\n\n---\n\n**Built by LXGIC Studios**\n\n- GitHub: [github.com\u002Flxgicstudios\u002Fai-merge-resolve](https:\u002F\u002Fgithub.com\u002Flxgicstudios\u002Fai-merge-resolve)\n- Twitter: [@lxgicstudios](https:\u002F\u002Fx.com\u002Flxgicstudios)\n","# Merge Resolver\n\nGot merge conflicts? This tool understands both versions and picks the right resolution.\n\n## Quick Start\n\n```bash\nnpx ai-merge-resolve\n```\n\n## What It Does\n\n- Finds all merge conflicts in repo\n- Analyzes both versions semantically\n- Suggests intelligent resolutions\n- Can auto-resolve simple conflicts\n\n## Usage Examples\n\n```bash\n# Resolve all conflicts\nnpx ai-merge-resolve\n\n# Resolve specific file\nnpx ai-merge-resolve .\u002Fsrc\u002Fapi.ts\n\n# Auto-resolve obvious ones\nnpx ai-merge-resolve --auto\n\n# Interactive mode\nnpx ai-merge-resolve --interactive\n```\n\n## How It Works\n\nDoesn't just pick \"theirs\" or \"ours\". Actually reads the code, understands intent, and merges the functionality properly.\n\n## Output\n\n```\nResolving src\u002Futils.ts...\n- Conflict 1: Both added logging → Combined both log statements\n- Conflict 2: Different error messages → Kept more descriptive one\n✓ Resolved 2 conflicts\n```\n\n## Requirements\n\nNode.js 18+. OPENAI_API_KEY required. Must have active merge conflicts.\n\n## License\n\nMIT. Free forever.\n\n---\n\n**Built by LXGIC Studios**\n\n- GitHub: [github.com\u002Flxgicstudios\u002Fai-merge-resolve](https:\u002F\u002Fgithub.com\u002Flxgicstudios\u002Fai-merge-resolve)\n- Twitter: [@lxgicstudios](https:\u002F\u002Fx.com\u002Flxgicstudios)\n",{"name":5,"description":7},"main","e7e336ac628c3e3bd771aff1aaa469c93778f94a","skills\u002Flxgicstudios\u002Fai-merge-resolve",0,"https:\u002F\u002Fgithub.com\u002Fkbarbel640-del\u002Fskills","https:\u002F\u002Fgithub.com\u002Fkbarbel640-del","2026-08-23 22:39:37",{"source":8,"skillName":5,"commands":38,"prompt":48,"zipAvailable":49},[39,42,45],{"tool":40,"command":41},"npx","npx skills add kbarbel640-del\u002Fskills --skill merge-resolve",{"tool":43,"command":44},"bunx","bunx skills add kbarbel640-del\u002Fskills --skill merge-resolve",{"tool":46,"command":47},"pnpm","pnpm dlx skills add kbarbel640-del\u002Fskills --skill merge-resolve","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fkbarbel640-del\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Flxgicstudios\u002Fai-merge-resolve\u002FSKILL.md",true,[51],{"path":52,"resourceType":53,"resourceTypeDesc":54,"sizeBytes":55,"sourceHtmlUrl":56},"_meta.json","REFERENCE","参考文档",475,"https:\u002F\u002Fgithub.com\u002Fkbarbel640-del\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Flxgicstudios\u002Fai-merge-resolve\u002F_meta.json",[58,89,118,139,145,164],{"skillNo":59,"name":60,"nameZh":6,"description":61,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":62,"categories":63,"keywords":69,"publishedAt":25},"01M6G8J55967D6281ACMKAKTEQ","crowd-prompting","A marketplace where AI agents improve prompts, system instructions, tool descriptions, and other text-based content with domain expertise from real-world operations — and earn tokens for valuable contributions.","https:\u002F\u002Fgithub.com\u002Fkbarbel640-del\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fzzadrian\u002Fcrowd-prompting\u002FSKILL.md",[64],{"categoryNo":65,"categoryName":66,"taxonomyType":67,"taxonomyTypeDesc":68},"01JBSEEDCAT000000000000036","内容创作者","PROFESSION","适用职业",[70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88],"crowd prompting","prompting","api","with","tokens","domain","world","prompts","operations","instructions","text","tool","system","improve","productivity","marketplace","https","content","ai agents",{"skillNo":90,"name":91,"nameZh":6,"description":92,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":93,"categories":94,"keywords":100,"publishedAt":25},"01M6G8J0PKPAYVET6BWE8W4C26","dilemm-ai","Compete in DilemmAI, the prisoner's dilemma AI arena at dilemm.ai. Use when an OpenClaw agent wants to create an account, design and submit strategy prompts for their bot, enter matchmaking, analyze historical matches and leaderboards, and iterate on bot strategy. Requires headless browser automation (no API available yet).","https:\u002F\u002Fgithub.com\u002Fkbarbel640-del\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fzyori\u002Fdilemm-ai\u002FSKILL.md",[95],{"categoryNo":96,"categoryName":97,"taxonomyType":98,"taxonomyTypeDesc":99},"01JBSEEDCAT000000000000023","Skill与智能体开发","SCENARIO","使用场景",[101,72,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,77,117],"dilemm ai","arena","analyze","browser","openclaw agent","create","automation","browser automation","bot","openclaw","design","strategy","headless","compete","submit","matchmaking","use",{"skillNo":119,"name":120,"nameZh":6,"description":121,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":122,"categories":123,"keywords":127,"publishedAt":25},"01M6G8HWAF3K9SW7NP3Z83CPJ6","arxiv-paper-reviews","Interact with arXiv Crawler API to fetch papers, read reviews, and submit comments. Use when working with arXiv papers, fetching paper lists by date\u002Fcategory\u002Finterest, viewing paper details with comments, or submitting paper reviews via API at http:\u002F\u002F150.158.152.82:8000.","https:\u002F\u002Fgithub.com\u002Fkbarbel640-del\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fzxrys\u002Fweak-accept\u002FSKILL.md",[124],{"categoryNo":125,"categoryName":126,"taxonomyType":98,"taxonomyTypeDesc":99},"01JBSEEDCAT000000000000021","资料检索与研究",[128,129,130,131,132,133,134,73,135,115,117,136,72,137,138],"arxiv paper reviews","reviews","arxiv","paper","crawler","papers","comments","fetch","read","http","via",{"skillNo":140,"name":120,"nameZh":6,"description":121,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":141,"categories":142,"keywords":144,"publishedAt":25},"01M6G8HQJ7N7WMY6YV7D7SSJ16","https:\u002F\u002Fgithub.com\u002Fkbarbel640-del\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fzxrys\u002Farxiv-paper-reviews\u002FSKILL.md",[143],{"categoryNo":125,"categoryName":126,"taxonomyType":98,"taxonomyTypeDesc":99},[131,130,129,128,138,133,134,73,132,115,117,135,136,72,137],{"skillNo":146,"name":147,"nameZh":6,"description":148,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":149,"categories":150,"keywords":151,"publishedAt":25},"01M6G8HM95Y64JNVFC2HN4E2BG","git-summary","Get a quick summary of the current Git repository including status, recent commits, branches, and contributors.","https:\u002F\u002Fgithub.com\u002Fkbarbel640-del\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fzweack\u002Fgit-summary\u002FSKILL.md",[],[21,152,153,154,155,156,157,158,159,160,161,162,163],"summary","git summary","commits","repository","win32","status","linux","contributors","true","quick","get","branches",{"skillNo":165,"name":166,"nameZh":6,"description":167,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":168,"categories":169,"keywords":174,"publishedAt":25},"01M6G8HGEGF05CNEJCGVYFSC4R","agent-constitution","Interact with AgentConstitution governance contracts on Base Sepolia. Check compliance, read rules, log actions, query governance state.","https:\u002F\u002Fgithub.com\u002Fkbarbel640-del\u002Fskills\u002Fblob\u002Fmain\u002Fskills\u002Fztsalexey\u002Fagent-constitution\u002FSKILL.md",[170,171],{"categoryNo":96,"categoryName":97,"taxonomyType":98,"taxonomyTypeDesc":99},{"categoryNo":172,"categoryName":173,"taxonomyType":67,"taxonomyTypeDesc":68},"01JBSEEDCAT000000000000037","律师与法务",[175,176,177,178,73,179,180,30,181,136,182,183,184,185,186,86,187,188,189],"agent constitution","constitution","contracts","tree","query","base","log","check","Rules","projects","compliance","actions","state","governance","github"]