[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7C7BASGDZPQ70KKYDPXP3FR":3,"skill-same:01M7C7BASGDZPQ70KKYDPXP3FR":51},{"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":19,"linkOnly":20,"markdownContent":21,"markdownBody":22,"frontMatter":23,"refName":24,"commitSha":25,"skillDirectory":26,"forksCount":27,"repositoryHtmlUrl":28,"repositoryHomepageUrl":6,"ownerHtmlUrl":29,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":30,"install":31,"resources":44},"01M7C7BASGDZPQ70KKYDPXP3FR","resolving-merge-conflicts",null,"Use when you need to resolve an in-progress git merge\u002Frebase conflict.","ShehabMohamedGamal\u002Fsimple-laravel","ShehabMohamedGamal","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F83552041?v=4","01M7C79TF94SZ9036Z0Y5G9JQ8","Shehab","01M7C79TFV0WDW2DAMGB1JSKA6",1,"MIT","https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal\u002Fsimple-laravel\u002Fblob\u002Fmain\u002Fmodules\u002F.agents\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","7eaad6bd4c63295f8cb6f3e970ebcf4b25fe3707","modules\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts",0,"https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal\u002Fsimple-laravel","https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal","2026-10-17 01:25:38",{"source":8,"skillName":5,"commands":32,"prompt":42,"zipAvailable":43},[33,36,39],{"tool":34,"command":35},"npx","npx skills add ShehabMohamedGamal\u002Fsimple-laravel --skill resolving-merge-conflicts",{"tool":37,"command":38},"bunx","bunx skills add ShehabMohamedGamal\u002Fsimple-laravel --skill resolving-merge-conflicts",{"tool":40,"command":41},"pnpm","pnpm dlx skills add ShehabMohamedGamal\u002Fsimple-laravel --skill resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal\u002Fsimple-laravel\u002Fblob\u002Fmain\u002Fmodules\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002FSKILL.md",true,[45],{"path":46,"resourceType":47,"resourceTypeDesc":48,"sizeBytes":49,"sourceHtmlUrl":50},"agents\u002Fopenai.yaml","REFERENCE","参考文档",113,"https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal\u002Fsimple-laravel\u002Fblob\u002Fmain\u002Fmodules\u002F.agents\u002Fskills\u002Fresolving-merge-conflicts\u002Fagents\u002Fopenai.yaml",[52,59,66,73,80,87],{"skillNo":53,"name":54,"nameZh":6,"description":55,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":56,"categories":57,"keywords":58,"publishedAt":19},"01M7C7HHRAH4W5GMGYTYQ0S02S","writing-for-agents","Writing documents for agents. Use when creating or editing skills, or modifying AGENTS.md or CLAUDE.md.","https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal\u002Fsimple-laravel\u002Fblob\u002Fmain\u002Fsimple\u002F.agents\u002Fskills\u002Fwriting-for-agents\u002FSKILL.md",[],[],{"skillNo":60,"name":61,"nameZh":6,"description":62,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":63,"categories":64,"keywords":65,"publishedAt":19},"01M7C7HDVEACGV78RYY9BNWKHP","wizard","Generate an interactive bash wizard that walks a human through steps only they can perform. Use when provisioning infrastructure, setting up credentials or CI secrets, walking an unfamiliar third-party dashboard, or running a one-off migration or cutover. Don't invoke this for steps the agent can perform itself.","https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal\u002Fsimple-laravel\u002Fblob\u002Fmain\u002Fsimple\u002F.agents\u002Fskills\u002Fwizard\u002FSKILL.md",[],[],{"skillNo":67,"name":68,"nameZh":6,"description":69,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":70,"categories":71,"keywords":72,"publishedAt":19},"01M7C7HACMYEQQ9B438937AVKD","wayfinder","Plan a huge chunk of work (more than one agent session can hold) as a shared map of decision tickets on your issue tracker, and resolve them one at a time until the way to the destination is clear.","https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal\u002Fsimple-laravel\u002Fblob\u002Fmain\u002Fsimple\u002F.agents\u002Fskills\u002Fwayfinder\u002FSKILL.md",[],[],{"skillNo":74,"name":75,"nameZh":6,"description":76,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":77,"categories":78,"keywords":79,"publishedAt":19},"01M7C7H84BTB72N82WS4GR6XYZ","wait-what","Stop. That last message did not land: re-pitch it.","https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal\u002Fsimple-laravel\u002Fblob\u002Fmain\u002Fsimple\u002F.agents\u002Fskills\u002Fwait-what\u002FSKILL.md",[],[],{"skillNo":81,"name":82,"nameZh":6,"description":83,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":84,"categories":85,"keywords":86,"publishedAt":19},"01M7C7H65MWB2N1675BAR689CW","visual-spec","Turn the grilled conversation into a spec, optionally confirming risky decisions as a visual HTML explainer first, then publish it to the issue tracker.","https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal\u002Fsimple-laravel\u002Fblob\u002Fmain\u002Fsimple\u002F.agents\u002Fskills\u002Fvisual-spec\u002FSKILL.md",[],[],{"skillNo":88,"name":89,"nameZh":6,"description":90,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":91,"categories":92,"keywords":93,"publishedAt":19},"01M7C7H40KNBS5P324GS9AE7PZ","triage","Move issues and external PRs through a state machine of triage roles, categorise, verify, grill if needed, and write agent-ready briefs.","https:\u002F\u002Fgithub.com\u002FShehabMohamedGamal\u002Fsimple-laravel\u002Fblob\u002Fmain\u002Fsimple\u002F.agents\u002Fskills\u002Ftriage\u002FSKILL.md",[],[]]