[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7C17C9WN55CH5D9Z3C2N0RW":3,"skill-same:01M7C17C9WN55CH5D9Z3C2N0RW":44},{"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},"01M7C17C9WN55CH5D9Z3C2N0RW","resolve-conflicts",null,"Use when you need to resolve an in-progress git merge, rebase, or cherry-pick conflict — \u003C\u003C\u003C\u003C\u003C\u003C\u003C markers are present, or git status shows unmerged paths.","zak-keown\u002Fmoe","zak-keown","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F320717241?v=4","01M7BZFXME0NW6TQX0H7AZM2KS","01M7BZFXN32VR0JN5AATRD53H4",0,"Apache-2.0","https:\u002F\u002Fgithub.com\u002Fzak-keown\u002Fmoe\u002Fblob\u002Fmain\u002Fplugins\u002Fmoe\u002F.cursor-plugin\u002Fskills\u002Fresolve-conflicts\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: resolve-conflicts\ndescription: \"Use when you need to resolve an in-progress git merge, rebase, or cherry-pick conflict — \u003C\u003C\u003C\u003C\u003C\u003C\u003C markers are present, or git status shows unmerged paths.\"\n---\n\n# Resolving Merge Conflicts\n\nWork through merge or rebase conflicts hunk by hunk, preserving both sides'\nintent. Always resolve; never abort.\n\n## 1. See the current state\n\n```\ngit status                              # unmerged paths\ngit diff --name-only --diff-filter=U    # just the conflicting files\ngit log --merge --oneline               # commits involved in the conflict\n```\n\nRead the conflicting files. Understand the shape: how many files, how many\nhunks, whether the conflicts are textual (overlapping edits) or structural\n(file renamed on one side, edited on the other).\n\n## 2. Research intent from primary sources\n\nFor each conflict, understand **why** each side made its change before touching\nthe markers. Read:\n\n- The commit messages on both sides (`git log --merge -p`)\n- PR\u002FMR descriptions if available (`gh pr view`, `glab mr view`)\n- The original issue or ticket if referenced\n\nThe goal is to know each side's *intent*, not just its *diff*. Two hunks that\nlook incompatible often serve the same goal from different starting points.\n\n## 3. Resolve each hunk\n\n- **Preserve both intents** where possible — most conflicts are additive, not\n  contradictory.\n- **When intents are incompatible**, pick the one that matches the merge's\n  stated goal (the branch being merged into wins on convention; the feature\n  branch wins on purpose). Note the trade-off in the commit message.\n- **Do not invent new behaviour.** A conflict resolution combines or chooses;\n  it does not redesign. If the resolution needs new code, that is a follow-up\n  commit, not part of the merge.\n- **`--ours` \u002F `--theirs` shortcuts** — use `git checkout --ours \u003Cfile>` or\n  `git checkout --theirs \u003Cfile>` only when one side's change is entirely\n  superseded and you have confirmed this from the primary sources. Never use\n  them to skip reading the conflict.\n\n## 4. Verify\n\nRun the project's automated checks in order: typecheck, then tests, then\nformat. Fix whatever fails before continuing — per `merge-discipline`, this\nis not limited to what the merge itself broke. A failure that predates the\nconflict, or lives on the other side's changes, is still yours to fix once\nyou're the one doing the merge. The resolution owns correctness, not a\nfollow-up commit.\n\n## 5. Finish\n\n```\ngit add \u003Cresolved files>\ngit merge --continue    # or: git rebase --continue\n```\n\nIf rebasing, repeat from step 1 for each subsequent commit that conflicts until\nthe rebase completes.\n\n## Common Rationalizations\n\n| Thought | Reality |\n|---------|---------|\n| \"Just take ours\" | That silently drops the other side's intent. Read the source first. |\n| \"Just take theirs\" | Same problem in reverse. |\n| \"I'll abort and start over\" | The same conflict will reappear. Resolve it now. |\n| \"The conflict is too complex, let me rewrite this section\" | A merge resolution combines or chooses. New code is a follow-up commit. |\n| \"The tests pass, so the resolution is correct\" | Tests passing is necessary but not sufficient. The intent check (step 2) catches semantic regressions tests miss. |\n| \"That failure was already there before the conflict\" | Doesn't matter — see `merge-discipline`. You're merging, so you own the result. |\n","# Resolving Merge Conflicts\n\nWork through merge or rebase conflicts hunk by hunk, preserving both sides'\nintent. Always resolve; never abort.\n\n## 1. See the current state\n\n```\ngit status                              # unmerged paths\ngit diff --name-only --diff-filter=U    # just the conflicting files\ngit log --merge --oneline               # commits involved in the conflict\n```\n\nRead the conflicting files. Understand the shape: how many files, how many\nhunks, whether the conflicts are textual (overlapping edits) or structural\n(file renamed on one side, edited on the other).\n\n## 2. Research intent from primary sources\n\nFor each conflict, understand **why** each side made its change before touching\nthe markers. Read:\n\n- The commit messages on both sides (`git log --merge -p`)\n- PR\u002FMR descriptions if available (`gh pr view`, `glab mr view`)\n- The original issue or ticket if referenced\n\nThe goal is to know each side's *intent*, not just its *diff*. Two hunks that\nlook incompatible often serve the same goal from different starting points.\n\n## 3. Resolve each hunk\n\n- **Preserve both intents** where possible — most conflicts are additive, not\n  contradictory.\n- **When intents are incompatible**, pick the one that matches the merge's\n  stated goal (the branch being merged into wins on convention; the feature\n  branch wins on purpose). Note the trade-off in the commit message.\n- **Do not invent new behaviour.** A conflict resolution combines or chooses;\n  it does not redesign. If the resolution needs new code, that is a follow-up\n  commit, not part of the merge.\n- **`--ours` \u002F `--theirs` shortcuts** — use `git checkout --ours \u003Cfile>` or\n  `git checkout --theirs \u003Cfile>` only when one side's change is entirely\n  superseded and you have confirmed this from the primary sources. Never use\n  them to skip reading the conflict.\n\n## 4. Verify\n\nRun the project's automated checks in order: typecheck, then tests, then\nformat. Fix whatever fails before continuing — per `merge-discipline`, this\nis not limited to what the merge itself broke. A failure that predates the\nconflict, or lives on the other side's changes, is still yours to fix once\nyou're the one doing the merge. The resolution owns correctness, not a\nfollow-up commit.\n\n## 5. Finish\n\n```\ngit add \u003Cresolved files>\ngit merge --continue    # or: git rebase --continue\n```\n\nIf rebasing, repeat from step 1 for each subsequent commit that conflicts until\nthe rebase completes.\n\n## Common Rationalizations\n\n| Thought | Reality |\n|---------|---------|\n| \"Just take ours\" | That silently drops the other side's intent. Read the source first. |\n| \"Just take theirs\" | Same problem in reverse. |\n| \"I'll abort and start over\" | The same conflict will reappear. Resolve it now. |\n| \"The conflict is too complex, let me rewrite this section\" | A merge resolution combines or chooses. New code is a follow-up commit. |\n| \"The tests pass, so the resolution is correct\" | Tests passing is necessary but not sufficient. The intent check (step 2) catches semantic regressions tests miss. |\n| \"That failure was already there before the conflict\" | Doesn't matter — see `merge-discipline`. You're merging, so you own the result. |\n",{"name":5,"description":7},"main","728894f3f85fbd4e788f015ddfd72bb6155d5dd5","plugins\u002Fmoe\u002F.cursor-plugin\u002Fskills\u002Fresolve-conflicts",1,"https:\u002F\u002Fgithub.com\u002Fzak-keown\u002Fmoe","https:\u002F\u002Fgithub.com\u002Fzak-keown","2026-09-05 06:29:06",{"source":8,"skillName":5,"commands":31,"prompt":41,"zipAvailable":42},[32,35,38],{"tool":33,"command":34},"npx","npx skills add zak-keown\u002Fmoe --skill resolve-conflicts",{"tool":36,"command":37},"bunx","bunx skills add zak-keown\u002Fmoe --skill resolve-conflicts",{"tool":39,"command":40},"pnpm","pnpm dlx skills add zak-keown\u002Fmoe --skill resolve-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fzak-keown\u002Fmoe\u002Fblob\u002Fmain\u002Fplugins\u002Fmoe\u002F.cursor-plugin\u002Fskills\u002Fresolve-conflicts\u002FSKILL.md",true,[],[45,52,59,66,73,80],{"skillNo":46,"name":47,"nameZh":6,"description":48,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":49,"categories":50,"keywords":51,"publishedAt":18},"01M7C1Z5362Y8NVRZ69HWP0ZD0","write-skill","Use when creating new skills, editing existing skills, or verifying skills work before deployment","https:\u002F\u002Fgithub.com\u002Fzak-keown\u002Fmoe\u002Fblob\u002Fmain\u002Fplugins\u002Fmoe\u002Fskills\u002Fwrite-skill\u002FSKILL.md",[],[],{"skillNo":53,"name":54,"nameZh":6,"description":55,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":56,"categories":57,"keywords":58,"publishedAt":18},"01M7C1YZ9966WK9R6ZRPCGWF3G","write-plan","Use when you have a spec or requirements for a multi-step task, before touching code","https:\u002F\u002Fgithub.com\u002Fzak-keown\u002Fmoe\u002Fblob\u002Fmain\u002Fplugins\u002Fmoe\u002Fskills\u002Fwrite-plan\u002FSKILL.md",[],[],{"skillNo":60,"name":61,"nameZh":6,"description":62,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":63,"categories":64,"keywords":65,"publishedAt":18},"01M7C1YMR4SJD7BPBBPXZCVGVH","write-clearly","Apply Strunk's timeless writing rules to ANY prose humans will read—documentation, commit messages, error messages, explanations, reports, or UI text. Makes your writing clearer, stronger, and more professional.","https:\u002F\u002Fgithub.com\u002Fzak-keown\u002Fmoe\u002Fblob\u002Fmain\u002Fplugins\u002Fmoe\u002Fskills\u002Fwrite-clearly\u002FSKILL.md",[],[],{"skillNo":67,"name":68,"nameZh":6,"description":69,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":70,"categories":71,"keywords":72,"publishedAt":18},"01M7C1YH9805YSM0N20VQAVSXF","windows-vm","Create, manage, or connect to a headless Windows 11 VM running in Docker with SSH access. Use when the user wants to spin up, stop, restart, or SSH into a Windows VM.","https:\u002F\u002Fgithub.com\u002Fzak-keown\u002Fmoe\u002Fblob\u002Fmain\u002Fplugins\u002Fmoe\u002Fskills\u002Fwindows-vm\u002FSKILL.md",[],[],{"skillNo":74,"name":75,"nameZh":6,"description":76,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":77,"categories":78,"keywords":79,"publishedAt":18},"01M7C1YD87SCNEJ2C9B8HFR2NQ","verify-completion","Use when about to claim work is complete, fixed, or passing, before committing or creating MRs - requires running verification commands and confirming output before making any success claims; evidence before assertions always","https:\u002F\u002Fgithub.com\u002Fzak-keown\u002Fmoe\u002Fblob\u002Fmain\u002Fplugins\u002Fmoe\u002Fskills\u002Fverify-completion\u002FSKILL.md",[],[],{"skillNo":81,"name":82,"nameZh":6,"description":83,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":6,"repositoryNo":12,"starsCount":13,"licenseSpdxId":14,"licenseFileUrl":6,"sourceHtmlUrl":84,"categories":85,"keywords":86,"publishedAt":18},"01M7C1YARDEHT0TJ9BRG30ZCF4","using-moe","Use when starting any conversation - establishes how to find and use skills, requiring skill invocation before ANY response including clarifying questions","https:\u002F\u002Fgithub.com\u002Fzak-keown\u002Fmoe\u002Fblob\u002Fmain\u002Fplugins\u002Fmoe\u002Fskills\u002Fusing-moe\u002FSKILL.md",[],[]]