[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M780KDXNE0D45B0ADCAYASKM":3,"skill-same:01M780KDXNE0D45B0ADCAYASKM":82},{"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":16,"sourceHtmlUrl":17,"categories":18,"keywords":19,"publishedAt":20,"linkOnly":21,"markdownContent":22,"markdownBody":23,"frontMatter":24,"refName":25,"commitSha":26,"skillDirectory":27,"forksCount":28,"repositoryHtmlUrl":29,"repositoryHomepageUrl":6,"ownerHtmlUrl":30,"ownerBlogUrl":31,"ownerDescription":32,"updatedAt":33,"install":34,"resources":47},"01M780KDXNE0D45B0ADCAYASKM","cursor-fix-merge-conflicts",null,"Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution","TheAngryPit\u002FTheAngrySkills","TheAngryPit","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F7040636?v=4","01M7803EENA9ATXJ46S9268QJX","Vitor Cepeda Lopes","01M7803EF9FMF4G4420XE4DV7Y",0,"MIT","https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fskills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts\u002FLICENSE.upstream","https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fskills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: cursor-fix-merge-conflicts\ndescription: Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution\n---\n\n## Runtime selection\n\nBefore runtime-dependent work, read [execution selection](references\u002Fruntime\u002Fselection.md). In a verified T3 host follow [the T3 contract](references\u002Fruntime\u002Ft3.md) and its method reference; the inline section below is the native Codex branch, not literal T3 dispatch. Outside T3, native Codex follows that inline branch unchanged. If the host is ambiguous or a required capability is unavailable, report the gap; a permission refusal never authorizes switching branches.\n\n## Native Codex branch\n\n## Codex mirror boundary\n\nResolve the named skill, tool, connector, and account against what is actually available in this Codex session before following the upstream steps. Do not infer connection, authentication, credits, or runtime parity from this mirror. Preserve the external product named upstream and report a concrete missing capability when required.\n\n# Fix merge conflicts\n\n## Trigger\n\nBranch has unresolved merge conflicts and needs a reliable path to a buildable state.\n\n## Workflow\n\n1. Detect all conflicting files from git status and conflict markers.\n2. Resolve each conflict with minimal, correctness-first edits.\n3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.\n4. Regenerate lockfiles with package manager tools instead of hand-editing.\n5. Run compile, lint, and relevant tests.\n6. Stage resolved files and summarize key decisions.\n\n## Guardrails\n\n- Keep changes minimal and readable.\n- Do not leave conflict markers in any file.\n- Avoid broad refactors while resolving conflicts.\n- Do not push or tag during conflict resolution.\n\n## Output\n\n- Files resolved\n- Notable resolution choices\n- Build\u002Ftest outcome\n","## Runtime selection\n\nBefore runtime-dependent work, read [execution selection](references\u002Fruntime\u002Fselection.md). In a verified T3 host follow [the T3 contract](references\u002Fruntime\u002Ft3.md) and its method reference; the inline section below is the native Codex branch, not literal T3 dispatch. Outside T3, native Codex follows that inline branch unchanged. If the host is ambiguous or a required capability is unavailable, report the gap; a permission refusal never authorizes switching branches.\n\n## Native Codex branch\n\n## Codex mirror boundary\n\nResolve the named skill, tool, connector, and account against what is actually available in this Codex session before following the upstream steps. Do not infer connection, authentication, credits, or runtime parity from this mirror. Preserve the external product named upstream and report a concrete missing capability when required.\n\n# Fix merge conflicts\n\n## Trigger\n\nBranch has unresolved merge conflicts and needs a reliable path to a buildable state.\n\n## Workflow\n\n1. Detect all conflicting files from git status and conflict markers.\n2. Resolve each conflict with minimal, correctness-first edits.\n3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.\n4. Regenerate lockfiles with package manager tools instead of hand-editing.\n5. Run compile, lint, and relevant tests.\n6. Stage resolved files and summarize key decisions.\n\n## Guardrails\n\n- Keep changes minimal and readable.\n- Do not leave conflict markers in any file.\n- Avoid broad refactors while resolving conflicts.\n- Do not push or tag during conflict resolution.\n\n## Output\n\n- Files resolved\n- Notable resolution choices\n- Build\u002Ftest outcome\n",{"name":5,"description":7},"main","f31e1d2df163b90a48e30d0a3df67285f6641418","skills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts",1,"https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills","https:\u002F\u002Fgithub.com\u002FTheAngryPit","www.vitorcepedalopes.com","Creative Director | Executive Producer | Storyteller | Narrative Worlds & Creative Production Systems\r\nFounder @TheHive-Mind ","2026-11-14 21:48:38",{"source":8,"skillName":5,"commands":35,"prompt":45,"zipAvailable":46},[36,39,42],{"tool":37,"command":38},"npx","npx skills add TheAngryPit\u002FTheAngrySkills --skill cursor-fix-merge-conflicts",{"tool":40,"command":41},"bunx","bunx skills add TheAngryPit\u002FTheAngrySkills --skill cursor-fix-merge-conflicts",{"tool":43,"command":44},"pnpm","pnpm dlx skills add TheAngryPit\u002FTheAngrySkills --skill cursor-fix-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fskills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts\u002FSKILL.md",true,[48,53,59,63,66,70,74,78],{"path":49,"resourceType":50,"resourceTypeDesc":51,"sizeBytes":52,"sourceHtmlUrl":16},"LICENSE.upstream","LICENSE","许可证",1063,{"path":54,"resourceType":55,"resourceTypeDesc":56,"sizeBytes":57,"sourceHtmlUrl":58},"MIRROR.md","REFERENCE","参考文档",865,"https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fskills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts\u002FMIRROR.md",{"path":60,"resourceType":55,"resourceTypeDesc":56,"sizeBytes":61,"sourceHtmlUrl":62},"references\u002Fruntime\u002Fmethod.md",1711,"https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fskills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts\u002Freferences\u002Fruntime\u002Fmethod.md",{"path":64,"resourceType":55,"resourceTypeDesc":56,"sizeBytes":61,"sourceHtmlUrl":65},"references\u002Fruntime\u002Fnative-codex.md","https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fskills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts\u002Freferences\u002Fruntime\u002Fnative-codex.md",{"path":67,"resourceType":55,"resourceTypeDesc":56,"sizeBytes":68,"sourceHtmlUrl":69},"references\u002Fruntime\u002Foriginal-codex.txt",1357,"https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fskills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts\u002Freferences\u002Fruntime\u002Foriginal-codex.txt",{"path":71,"resourceType":55,"resourceTypeDesc":56,"sizeBytes":72,"sourceHtmlUrl":73},"references\u002Fruntime\u002Fruntime-files.json",567,"https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fskills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts\u002Freferences\u002Fruntime\u002Fruntime-files.json",{"path":75,"resourceType":55,"resourceTypeDesc":56,"sizeBytes":76,"sourceHtmlUrl":77},"references\u002Fruntime\u002Fselection.md",1783,"https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fskills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts\u002Freferences\u002Fruntime\u002Fselection.md",{"path":79,"resourceType":55,"resourceTypeDesc":56,"sizeBytes":80,"sourceHtmlUrl":81},"references\u002Fruntime\u002Ft3.md",5135,"https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fskills\u002Fmirrors-cursor\u002Fcursor-fix-merge-conflicts\u002Freferences\u002Fruntime\u002Ft3.md",[83,90,97,104,111,118],{"skillNo":84,"name":85,"nameZh":6,"description":86,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":87,"categories":88,"keywords":89,"publishedAt":20},"01M782GJ4CTPNKZN0WXTASXXZ4","X MCP guide","ALWAYS read this before using any X tool (the X plugin, any X MCP, or Grok Bot's built-in public X reads) and again on any X error. X tools are included in Grok Bot at no cost: never estimate costs, check credits, or tell the user to buy credits. tools=0 \u002F user-X-* not found is a setup failure, not a paywall. Covers Spaces, communities, and Lists (reads and list writes), X Chat (XChat, inbox, DMs, unread, message requests, Chat PIN, juicebox, xchat_lite: clone xchat-grokbot-helper yourself and decrypt locally), scheduled X calls (schedule_call, list_scheduled_calls and the other call tools), and livestreams (stream sources, broadcasts, scheduled broadcasts, broadcast chat, moderators, mutes). Chat, call, livestream, Spaces, or Lists tools missing while other X tools work: reconnect the X plugin.","https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fsources\u002Fcursor-plugins\u002Fupstream-tree\u002Fthird_party\u002Fx\u002Fskills\u002Fx-api-mcp-guide\u002FSKILL.md",[],[],{"skillNo":91,"name":92,"nameZh":6,"description":93,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":94,"categories":95,"keywords":96,"publishedAt":20},"01M782GBW77901ESC9PD3XAM6V","X Money guide","Read this before the first X Money action in a session and again on any X Money error, refusal, or missing capability. Covers the approval rule for every action that moves money (always ask, every time, no exceptions), how the connection works (connection code plus passkey in the X app), how to guide the user through connect, reconnect, and revoke at x.com\u002Fi\u002Fmoney\u002Fsettings\u002Fconnections, and what each failure message means.","https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fsources\u002Fcursor-plugins\u002Fupstream-tree\u002Fthird_party\u002Fx-money\u002Fskills\u002Fx-money-guide\u002FSKILL.md",[],[],{"skillNo":98,"name":99,"nameZh":6,"description":100,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":101,"categories":102,"keywords":103,"publishedAt":20},"01M782G7CMYD2JSVT3RX81QRB8","google-slides","Build and edit Google Slides through the google-slides MCP tools - slides, grids of cards and columns, text boxes, shapes, images, tables, styling, layout inspection, and per-slide PNG rendering. Use when creating a deck, laying out slide elements, matching a template, or verifying how a slide looks.","https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fsources\u002Fcursor-plugins\u002Fupstream-tree\u002Fthird_party\u002Fgoogle-slides\u002Fskills\u002Fgoogle-slides\u002FSKILL.md",[],[],{"skillNo":105,"name":106,"nameZh":6,"description":107,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":108,"categories":109,"keywords":110,"publishedAt":20},"01M782G4DDAJ4SMGJEF13HTX69","google-sheets","Build and edit Google Sheets with the google-sheets tools - values, formatting, charts, conditional formatting, structure, validation, named and protected ranges. Use when creating a spreadsheet or dashboard, formatting cells, adding or fixing charts, or reorganizing tabs and rows.","https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fsources\u002Fcursor-plugins\u002Fupstream-tree\u002Fthird_party\u002Fgoogle-sheets\u002Fskills\u002Fgoogle-sheets\u002FSKILL.md",[],[],{"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":20},"01M782G1F8QNMNKRSY6M3Y0QG6","google-drive","Work with Google Drive through its MCP tools - search, read, create, organize, share, comment, and export files. Use when creating files in specific folders, moving or renaming, converting Markdown\u002FCSV into Docs\u002FSheets, managing comments, or exporting a rendered PDF.","https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fsources\u002Fcursor-plugins\u002Fupstream-tree\u002Fthird_party\u002Fgoogle-drive\u002Fskills\u002Fgoogle-drive\u002FSKILL.md",[],[],{"skillNo":119,"name":120,"nameZh":6,"description":121,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":122,"categories":123,"keywords":124,"publishedAt":20},"01M782FYVJ5XTP2R0B446RRYTX","google-docs","Author and edit Google Docs with the google-docs tools - structured writing, character and paragraph styling, lists, tables, images, headers\u002Ffooters. Use when creating a formatted document, editing document content, or applying styles.","https:\u002F\u002Fgithub.com\u002FTheAngryPit\u002FTheAngrySkills\u002Fblob\u002Fmain\u002Fsources\u002Fcursor-plugins\u002Fupstream-tree\u002Fthird_party\u002Fgoogle-docs\u002Fskills\u002Fgoogle-docs\u002FSKILL.md",[],[]]