[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7D5FQ336GRTMHPRCWH40MHB":3,"skill-same:01M7D5FQ336GRTMHPRCWH40MHB":50},{"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":18,"linkOnly":19,"markdownContent":20,"markdownBody":21,"frontMatter":22,"refName":23,"commitSha":24,"skillDirectory":25,"forksCount":26,"repositoryHtmlUrl":27,"repositoryHomepageUrl":6,"ownerHtmlUrl":28,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":29,"install":30,"resources":43},"01M7D5FQ336GRTMHPRCWH40MHB","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","Even-wang666\u002FMindMesh","Even-wang666","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F252680366?v=4","01M7D5DSKBXGB4A8279QNAQZT7","01M7D5DSKYESS165SJ90FMN84Q",1,"MIT","https:\u002F\u002Fgithub.com\u002FEven-wang666\u002FMindMesh\u002Fblob\u002Fmain\u002F.codex\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: resolving-merge-conflicts\ndescription: \"Use when you need to resolve an in-progress git merge\u002Frebase conflict.\"\n---\n\n1. **See the current state** of the merge\u002Frebase. Check git history, and the conflicting files.\n\n2. **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\u002Ftickets.\n\n3. **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`.\n\n4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke.\n\n5. **Finish the merge\u002Frebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.\n","1. **See the current state** of the merge\u002Frebase. Check git history, and the conflicting files.\n\n2. **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\u002Ftickets.\n\n3. **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`.\n\n4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke.\n\n5. **Finish the merge\u002Frebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.\n",{"name":5,"description":7},"main","35ec4aa021f80d7f620ddcc81cd739e4c31d2ed4",".codex\u002Fskills\u002Fresolving-merge-conflicts",0,"https:\u002F\u002Fgithub.com\u002FEven-wang666\u002FMindMesh","https:\u002F\u002Fgithub.com\u002FEven-wang666","2026-10-13 10:17:25",{"source":8,"skillName":5,"commands":31,"prompt":41,"zipAvailable":42},[32,35,38],{"tool":33,"command":34},"npx","npx skills add Even-wang666\u002FMindMesh --skill resolving-merge-conflicts",{"tool":36,"command":37},"bunx","bunx skills add Even-wang666\u002FMindMesh --skill resolving-merge-conflicts",{"tool":39,"command":40},"pnpm","pnpm dlx skills add Even-wang666\u002FMindMesh --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002FEven-wang666\u002FMindMesh\u002Fblob\u002Fmain\u002F.codex\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[44],{"path":45,"resourceType":46,"resourceTypeDesc":47,"sizeBytes":48,"sourceHtmlUrl":49},"agents\u002Fopenai.yaml","REFERENCE","参考文档",113,"https:\u002F\u002Fgithub.com\u002FEven-wang666\u002FMindMesh\u002Fblob\u002Fmain\u002F.codex\u002Fskills\u002Fresolving-merge-conflicts\u002Fagents\u002Fopenai.yaml",[51,58,65,72,79,86],{"skillNo":52,"name":53,"nameZh":6,"description":54,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":55,"categories":56,"keywords":57,"publishedAt":18},"01M7D5HHQJ3WBR7W4JKFPQGY0N","review","检查代码质量、风险和可维护性。","https:\u002F\u002Fgithub.com\u002FEven-wang666\u002FMindMesh\u002Fblob\u002Fmain\u002Fresources\u002Fskills\u002Freview\u002FSKILL.md",[],[],{"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":64,"publishedAt":18},"01M7D5HGTAFQMZRBYVJVAJKW8X","research","整理资料、比较证据并形成结构化结论。","https:\u002F\u002Fgithub.com\u002FEven-wang666\u002FMindMesh\u002Fblob\u002Fmain\u002Fresources\u002Fskills\u002Fresearch\u002FSKILL.md",[],[],{"skillNo":66,"name":67,"nameZh":6,"description":68,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":69,"categories":70,"keywords":71,"publishedAt":18},"01M7D5HEC5XPB57D2PNMN30VM7","report","将分析结果组织为清晰的专业报告。","https:\u002F\u002Fgithub.com\u002FEven-wang666\u002FMindMesh\u002Fblob\u002Fmain\u002Fresources\u002Fskills\u002Freport\u002FSKILL.md",[],[],{"skillNo":73,"name":74,"nameZh":6,"description":75,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":76,"categories":77,"keywords":78,"publishedAt":18},"01M7D5HAXZF4YYVNHDN87X57D7","mindmesh-builtin-workout-planner-v1","当用户需要根据目标、经验、设备、时间和身体限制设计渐进训练时使用。","https:\u002F\u002Fgithub.com\u002FEven-wang666\u002FMindMesh\u002Fblob\u002Fmain\u002Fresources\u002Fskills\u002Fmindmesh-builtin-workout-planner-v1\u002FSKILL.md",[],[],{"skillNo":80,"name":81,"nameZh":6,"description":82,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":83,"categories":84,"keywords":85,"publishedAt":18},"01M7D5H7DZEG44FC0V58P3WXQM","mindmesh-builtin-user-story-writer-v1","当用户需要把需求整理成用户故事、拆分故事或编写验收标准时使用。","https:\u002F\u002Fgithub.com\u002FEven-wang666\u002FMindMesh\u002Fblob\u002Fmain\u002Fresources\u002Fskills\u002Fmindmesh-builtin-user-story-writer-v1\u002FSKILL.md",[],[],{"skillNo":87,"name":88,"nameZh":6,"description":89,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":90,"categories":91,"keywords":92,"publishedAt":18},"01M7D5H3RK6VRTZMD04HAC0KAY","mindmesh-builtin-trip-planner-v1","当用户需要在预算、交通、节奏和兴趣之间安排逐日行程时使用。","https:\u002F\u002Fgithub.com\u002FEven-wang666\u002FMindMesh\u002Fblob\u002Fmain\u002Fresources\u002Fskills\u002Fmindmesh-builtin-trip-planner-v1\u002FSKILL.md",[],[]]