[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M6KK9N1NF7YCKSTHDCEN0679":3,"skill-same:01M6KK9N1NF7YCKSTHDCEN0679":64},{"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":23,"publishedAt":36,"linkOnly":37,"markdownContent":38,"markdownBody":39,"frontMatter":40,"refName":25,"commitSha":42,"skillDirectory":43,"forksCount":44,"repositoryHtmlUrl":45,"repositoryHomepageUrl":46,"ownerHtmlUrl":47,"ownerBlogUrl":48,"ownerDescription":49,"updatedAt":50,"install":51,"resources":63},"01M6KK9N1NF7YCKSTHDCEN0679","devspark-merge-from-main",null,"Merge the latest remote main into the current branch with a script; the agent only resolves merge conflicts","markhazleton\u002Fdevspark","markhazleton","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F223906?v=4","01M6KK0W78YZYB4P42RD3SPBPY","Mark Hazleton","01M6KK0WB5CB9VWPRVTAS52ZG8",0,"MIT","https:\u002F\u002Fgithub.com\u002Fmarkhazleton\u002Fdevspark\u002Fblob\u002Fmain\u002Ftemplates\u002Fconsumer-skills\u002Fdevspark-merge-from-main\u002FSKILL.md",[18],{"categoryNo":19,"categoryName":20,"taxonomyType":21,"taxonomyTypeDesc":22},"01JBSEEDCAT000000000000023","Skill与智能体开发","SCENARIO","使用场景",[24,25,26,27,28,29,30,31,32,33,34,35],"merge","main","devspark merge from main","branch","only","merge conflicts","conflicts","remote","with","script","true","latest","2026-11-10 10:12:30",false,"---\nname: devspark-merge-from-main\ndescription: \"Merge the latest remote main into the current branch with a script; the agent only resolves merge conflicts\"\nuser-invocable: true\ndisable-model-invocation: true\n---\n\n\u003C!-- Generated by DevSpark. Do not edit. -->\n\n## Prompt Resolution\n\nDetermine the current git user by running `git config user.name`.\nNormalize to a folder-safe slug: lowercase, replace spaces with hyphens, strip non-alphanumeric\u002Fhyphen chars.\n\nRead and execute the instructions from the **first file that exists**:\n\n1. `.devspark.work\u002F{git-user}\u002Fcommands\u002Fdevspark.merge-from-main.md` (personalized override)\n2. `.devspark.work\u002Fcommands\u002Fdevspark.merge-from-main.md` (team customization)\n3. `.devspark\u002Fdefaults\u002Fcommands\u002Fdevspark.merge-from-main.md` (stock default)\n\nWhere `{git-user}` is the normalized slug from the step above.\n\n## User Input\n\nThe text typed after `\u002Fdevspark-merge-from-main` is the command input. Pass it unchanged to the resolved prompt.\n","\u003C!-- Generated by DevSpark. Do not edit. -->\n\n## Prompt Resolution\n\nDetermine the current git user by running `git config user.name`.\nNormalize to a folder-safe slug: lowercase, replace spaces with hyphens, strip non-alphanumeric\u002Fhyphen chars.\n\nRead and execute the instructions from the **first file that exists**:\n\n1. `.devspark.work\u002F{git-user}\u002Fcommands\u002Fdevspark.merge-from-main.md` (personalized override)\n2. `.devspark.work\u002Fcommands\u002Fdevspark.merge-from-main.md` (team customization)\n3. `.devspark\u002Fdefaults\u002Fcommands\u002Fdevspark.merge-from-main.md` (stock default)\n\nWhere `{git-user}` is the normalized slug from the step above.\n\n## User Input\n\nThe text typed after `\u002Fdevspark-merge-from-main` is the command input. Pass it unchanged to the resolved prompt.\n",{"name":5,"description":7,"user-invocable":41,"disable-model-invocation":41},true,"d823c831a8fc3d9a3e154001cc7abcb37861350d","templates\u002Fconsumer-skills\u002Fdevspark-merge-from-main",1,"https:\u002F\u002Fgithub.com\u002Fmarkhazleton\u002Fdevspark","http:\u002F\u002Fdev.makeboldspark.com\u002F","https:\u002F\u002Fgithub.com\u002Fmarkhazleton","https:\u002F\u002Fmarkhazleton.com","Solutions Architect, lifelong learner, passionate for solutions which make technology work for business, not sidetracked by sizzle","2026-11-15 03:43:55",{"source":8,"skillName":5,"commands":52,"prompt":62,"zipAvailable":41},[53,56,59],{"tool":54,"command":55},"npx","npx skills add markhazleton\u002Fdevspark --skill devspark-merge-from-main",{"tool":57,"command":58},"bunx","bunx skills add markhazleton\u002Fdevspark --skill devspark-merge-from-main",{"tool":60,"command":61},"pnpm","pnpm dlx skills add markhazleton\u002Fdevspark --skill devspark-merge-from-main","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fmarkhazleton\u002Fdevspark\u002Fblob\u002Fmain\u002Ftemplates\u002Fconsumer-skills\u002Fdevspark-merge-from-main\u002FSKILL.md",[],[65,94,100,111,123,135],{"skillNo":66,"name":67,"nameZh":6,"description":68,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":69,"categories":70,"keywords":76,"publishedAt":36},"01M6MNBGS67Q2EJ8TEXQ1WXZRZ","devspark-roadmap","Optional roadmap planning. Establish product direction, record and right-size Prospective Specs, review delivery evidence for drift, and keep the roadmap structurally consistent, without touching code, tests, or Knowledge.","https:\u002F\u002Fgithub.com\u002Fmarkhazleton\u002Fdevspark\u002Fblob\u002Fmain\u002Ftemplates\u002Fconsumer-skills\u002Fdevspark-roadmap\u002FSKILL.md",[71],{"categoryNo":72,"categoryName":73,"taxonomyType":74,"taxonomyTypeDesc":75},"01JBSEEDCAT000000000000031","产品经理","PROFESSION","适用职业",[77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,34,93],"devspark roadmap","roadmap","review","code","planning","product","knowledge","evidence","record","drift","delivery","tests","direction","keep","roadmap planning","size","for",{"skillNo":95,"name":67,"nameZh":6,"description":68,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":96,"categories":97,"keywords":99,"publishedAt":36},"01M6MNB3KS236X44PZF2280RRE","https:\u002F\u002Fgithub.com\u002Fmarkhazleton\u002Fdevspark\u002Fblob\u002Fmain\u002F.github\u002Fskills\u002Fdevspark-roadmap\u002FSKILL.md",[98],{"categoryNo":72,"categoryName":73,"taxonomyType":74,"taxonomyTypeDesc":75},[77,78,92,34,93,90,79,91,80,81,82,83,84,85,86,87,88,89],{"skillNo":101,"name":102,"nameZh":6,"description":103,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":104,"categories":105,"keywords":106,"publishedAt":36},"01M6KKDZCRGPT87KHMMB7TSD39","team-helper","Unrelated team skill","https:\u002F\u002Fgithub.com\u002Fmarkhazleton\u002Fdevspark\u002Fblob\u002Fmain\u002Ftests\u002Ffixtures\u002Fupgrade\u002Fforeign-files\u002F.github\u002Fskills\u002Fteam-helper\u002FSKILL.md",[],[107,108,109,110],"team helper","helper","team","unrelated",{"skillNo":112,"name":113,"nameZh":6,"description":114,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":115,"categories":116,"keywords":117,"publishedAt":36},"01M6KKDWN5WYWQ5VZDE5YKDJVW","devspark-specify","Team-authored skill that happens to use a managed name","https:\u002F\u002Fgithub.com\u002Fmarkhazleton\u002Fdevspark\u002Fblob\u002Fmain\u002Ftests\u002Ffixtures\u002Fupgrade\u002Fforeign-files\u002F.github\u002Fskills\u002Fdevspark-specify\u002FSKILL.md",[],[118,119,109,120,121,34,122],"devspark specify","specify","use","name","managed",{"skillNo":124,"name":125,"nameZh":6,"description":126,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":127,"categories":128,"keywords":129,"publishedAt":36},"01M6KKDR6B2Y3KQ47WJD5DE1QW","devspark-retired-demo","Previously generated skill whose command is no longer shipped","https:\u002F\u002Fgithub.com\u002Fmarkhazleton\u002Fdevspark\u002Fblob\u002Fmain\u002Ftests\u002Ffixtures\u002Fupgrade\u002Fforeign-files\u002F.github\u002Fskills\u002Fdevspark-retired-demo\u002FSKILL.md",[],[130,131,132,34,133,134],"devspark retired demo","demo","generated skill","generated","command",{"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":141,"publishedAt":36},"01M6KKDM0PKYYDC3PRF5NES3RB","devspark-next","Detect the next lifecycle step","https:\u002F\u002Fgithub.com\u002Fmarkhazleton\u002Fdevspark\u002Fblob\u002Fmain\u002Ftests\u002Ffixtures\u002Fupgrade\u002Fforeign-files\u002F.github\u002Fskills\u002Fdevspark-next\u002FSKILL.md",[],[142,143,144,34,145],"next","devspark next","detect","lifecycle"]