[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7DTYVS27T1B3QMT9BYAMMTY":3,"skill-same:01M7DTYVS27T1B3QMT9BYAMMTY":47},{"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":29,"ownerHtmlUrl":30,"ownerBlogUrl":6,"ownerDescription":31,"updatedAt":32,"install":33,"resources":46},"01M7DTYVS27T1B3QMT9BYAMMTY","mk-resolving-merge-conflicts",null,"Resolves an in-progress git merge\u002Frebase conflict: reads conflict state, recovers each side's intent, resolves hunks, runs checks. NOT for the ship pipeline (mk:ship); NOT for bug debugging (mk:fix).","ngocsangyem\u002FMeowKit","ngocsangyem","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F33769536?v=4","01M6J3FSMJAG9PVQEGRT7AQ9J2","Sang Nguyen","01M6J3FSRTJG0MNP6NV71639RM",16,"MIT","https:\u002F\u002Fgithub.com\u002Fngocsangyem\u002FMeowKit\u002Fblob\u002Fmain\u002Fkit\u002Fbundles\u002Fcodex\u002Froot\u002F.agents\u002Fskills\u002Fmk-resolving-merge-conflicts\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: \"mk-resolving-merge-conflicts\"\ndescription: \"Resolves an in-progress git merge\u002Frebase conflict: reads conflict state, recovers each side's intent, resolves hunks, runs checks. NOT for the ship pipeline (mk:ship); NOT for bug debugging (mk:fix).\"\n---\n\n# Resolving Merge Conflicts\n\n> **Path convention:** Commands assume cwd is the repo root (`$(git rev-parse --show-toplevel)`).\n\n**Iron Laws**\n\n- **Resolve every conflict; do not abandon by default.** `git merge --abort` or\n  `git rebase --abort` requires explicit user direction. Completing the operation with\n  a commit or `git rebase --continue` also requires explicit user go-ahead.\n- **Do not invent new behaviour.** Resolution combines existing intents; it is not a\n  place to add features or refactor.\n\n## When to Use\n\n- `git status` shows `Unmerged paths` \u002F \"you have unmerged files\"\n- A `git merge`, `git rebase`, `git cherry-pick`, or `git pull` stopped on conflicts\n- User says \"resolve the conflicts\", \"fix the rebase\", \"finish the merge\"\n\n**Do NOT use when:** no operation is in progress (nothing to resolve), or the request is\nto start a merge\u002Fship from scratch (use `mk:ship`).\n\n## Workflow Integration\n\n**Phase: on-demand.** Most often fires inside Phase 5 (Ship) when `mk:ship` merges the\nbase branch and hits conflicts. Hands control back once the working tree is clean and\nchecks pass.\n\n## Process\n\nCopy this checklist and track progress:\n\n```\n- [ ] 1. See the current state (operation type + conflicted files)\n- [ ] 2. Find the primary sources (why each side changed)\n- [ ] 3. Resolve each hunk (preserve both intents)\n- [ ] 4. Run the project's automated checks\n- [ ] 5. Present resolved state and obtain approval to finish the merge\u002Frebase\n```\n\n### 1. See the current state\n\nDetermine whether a **merge** or a **rebase** is in progress — the finish step differs.\n\n```bash\ngit status                                   # human summary + hint line\ngit diff --name-only --diff-filter=U         # exact conflicted (unmerged) files\nls .git\u002FMERGE_HEAD 2>\u002Fdev\u002Fnull && echo MERGE # present => merge in progress\nls -d .git\u002Frebase-merge .git\u002Frebase-apply 2>\u002Fdev\u002Fnull && echo REBASE\ngit log --oneline -5 --all --decorate        # orient on recent history\n```\n\nRead every conflicted file. Note each `\u003C\u003C\u003C\u003C\u003C\u003C\u003C \u002F ======= \u002F >>>>>>>` hunk and which\nlabels mark each side (`HEAD`\u002F`ours` vs the incoming branch\u002Fcommit).\n\n> **Rebase side-swap:** during a rebase `ours` is the branch being rebased ONTO and\n> `theirs` is your commit being replayed — the opposite of a merge. Confirm before\n> assuming which side is \"yours\".\n\n### 2. Find the primary sources\n\nFor each conflict, understand *why* each change was made — do not guess from the diff alone.\n\n```bash\ngit log --merge -p -- \u003Cfile>                 # commits touching the conflict on both sides\ngit log -p \u003Cside> -- \u003Cfile>                  # full history of one side's hunk\ngh pr list --state merged --search \u003Cterm>    # the PR that introduced the change\ngh pr view \u003Cnum> ; gh issue view \u003Cnum>       # stated intent, linked tickets\n```\n\nRead commit messages, PR descriptions, and linked issues. The goal is the *original\nintent* behind each side, not just the textual difference.\n\n### 3. Resolve each hunk\n\nFor every hunk, in order of confidence:\n\n1. **Preserve both intents** where they are compatible — combine the two changes so\n   neither is lost. This is the default and most common outcome.\n2. **Where incompatible**, pick the side matching the **stated goal of the merge\u002Frebase**\n   (e.g. \"merge feature X into main\" → keep X's behaviour) and note the trade-off so the\n   discarded intent is visible to the user.\n3. Remove **all** conflict markers (`\u003C\u003C\u003C\u003C\u003C\u003C\u003C`, `=======`, `>>>>>>>`). Verify none remain:\n   `git grep -nE '^(\u003C{7}|={7}|>{7})' -- \u003Cfiles>` returns nothing.\n4. Stage each file as it is finished: `git add \u003Cfile>`.\n\nNever resolve by blindly taking one whole side (`-X ours`\u002F`-X theirs`) unless the file's\ntwo sides are genuinely one-or-the-other — that silently drops the other intent.\n\n### 4. Run the project's automated checks\n\nDiscover the checks before running them (do not assume). Typical order: **typecheck →\ntests → format.**\n\n```bash\ncat package.json        # scripts: typecheck \u002F lint \u002F test \u002F build \u002F format\nls Makefile justfile pyproject.toml Cargo.toml go.mod 2>\u002Fdev\u002Fnull\n```\n\nRun what exists (for example `cargo test` and `cargo clippy` in a Rust project, or the `typecheck`, `test` and `lint` scripts in `package.json`). Fix\nanything the merge broke — a resolution can be marker-free yet semantically wrong (e.g.\na function both sides renamed differently). Re-run until green.\n\n### 5. Obtain approval, then finish the merge\u002Frebase\n\n- **Ask first:** present the resolved files and check results. Do not run the following\n  commands until the user explicitly approves completion.\n- **Merge:** stage everything, then commit. The prepared message is usually correct;\n  keep it conventional and free of AI references.\n  ```bash\n  git add -A\n  git commit --no-edit        # or write a conventional message if none is prepared\n  ```\n- **Rebase:** continue, and **loop** — a rebase pauses once per conflicting commit.\n  ```bash\n  git add -A\n  git rebase --continue       # repeat steps 1-4 for each subsequent pause\n  ```\n  Repeat until `git status` reports the rebase is complete (no further stops).\n\nConfirm a clean tree (`git status` → \"nothing to commit, working tree clean\") before\nhanding off.\n\n## Output Format\n\n```\n## Merge Conflict Resolution: {merge|rebase} of {source} into {target}\n\n**Conflicted files:** {n}\n**Resolution summary:**\n- {file}: {kept both | chose {side} because {merge goal} — dropped {discarded intent}}\n\n**Checks:** typecheck {pass\u002Ffail} · tests {pass\u002Ffail} · format {pass\u002Ffail}\n**Finished:** {awaiting approval | commit sha | rebase complete}\n```\n\n## Failure Handling\n\n| Failure | Recovery |\n|---------|----------|\n| Cannot tell which side's intent should win | Surface both intents + the merge's stated goal to the user; ask — do NOT abort |\n| Checks fail after markers removed | Resolution is semantically wrong; re-read both sides' intent (step 2) and fix |\n| Conflict markers left in a file | `git grep -nE '^(\u003C{7}|={7}|>{7})'`; resolve remaining hunks before staging |\n| Rebase keeps re-conflicting on the same lines | Consider `git rerere`; otherwise resolve each pause carefully — never `--skip` a commit without user approval |\n| Binary file conflict | Choose a version explicitly (`git checkout --ours\u002F--theirs \u003Cfile>`) after confirming intent with the user |\n\n## Handoff Protocol\n\nOn a clean tree with green checks → return to `mk:ship` (if mid-ship) or `mk:verify` to\nconfirm the full build is green before continuing.\n\n## Gotchas\n\n- **`ours`\u002F`theirs` invert between merge and rebase** — during rebase, `ours` is the\n  upstream you are replaying onto, not your own work. Confirm direction before picking a side.\n- **Marker-free ≠ resolved** — code with no conflict markers can still be semantically\n  broken (both sides edited the same logic differently). Step 4's checks are what prove it.\n- **`git rebase --continue` pauses repeatedly** — one stop per conflicting commit. It is\n  not done until `git status` says so; resolving the first pause is not the end.","# Resolving Merge Conflicts\n\n> **Path convention:** Commands assume cwd is the repo root (`$(git rev-parse --show-toplevel)`).\n\n**Iron Laws**\n\n- **Resolve every conflict; do not abandon by default.** `git merge --abort` or\n  `git rebase --abort` requires explicit user direction. Completing the operation with\n  a commit or `git rebase --continue` also requires explicit user go-ahead.\n- **Do not invent new behaviour.** Resolution combines existing intents; it is not a\n  place to add features or refactor.\n\n## When to Use\n\n- `git status` shows `Unmerged paths` \u002F \"you have unmerged files\"\n- A `git merge`, `git rebase`, `git cherry-pick`, or `git pull` stopped on conflicts\n- User says \"resolve the conflicts\", \"fix the rebase\", \"finish the merge\"\n\n**Do NOT use when:** no operation is in progress (nothing to resolve), or the request is\nto start a merge\u002Fship from scratch (use `mk:ship`).\n\n## Workflow Integration\n\n**Phase: on-demand.** Most often fires inside Phase 5 (Ship) when `mk:ship` merges the\nbase branch and hits conflicts. Hands control back once the working tree is clean and\nchecks pass.\n\n## Process\n\nCopy this checklist and track progress:\n\n```\n- [ ] 1. See the current state (operation type + conflicted files)\n- [ ] 2. Find the primary sources (why each side changed)\n- [ ] 3. Resolve each hunk (preserve both intents)\n- [ ] 4. Run the project's automated checks\n- [ ] 5. Present resolved state and obtain approval to finish the merge\u002Frebase\n```\n\n### 1. See the current state\n\nDetermine whether a **merge** or a **rebase** is in progress — the finish step differs.\n\n```bash\ngit status                                   # human summary + hint line\ngit diff --name-only --diff-filter=U         # exact conflicted (unmerged) files\nls .git\u002FMERGE_HEAD 2>\u002Fdev\u002Fnull && echo MERGE # present => merge in progress\nls -d .git\u002Frebase-merge .git\u002Frebase-apply 2>\u002Fdev\u002Fnull && echo REBASE\ngit log --oneline -5 --all --decorate        # orient on recent history\n```\n\nRead every conflicted file. Note each `\u003C\u003C\u003C\u003C\u003C\u003C\u003C \u002F ======= \u002F >>>>>>>` hunk and which\nlabels mark each side (`HEAD`\u002F`ours` vs the incoming branch\u002Fcommit).\n\n> **Rebase side-swap:** during a rebase `ours` is the branch being rebased ONTO and\n> `theirs` is your commit being replayed — the opposite of a merge. Confirm before\n> assuming which side is \"yours\".\n\n### 2. Find the primary sources\n\nFor each conflict, understand *why* each change was made — do not guess from the diff alone.\n\n```bash\ngit log --merge -p -- \u003Cfile>                 # commits touching the conflict on both sides\ngit log -p \u003Cside> -- \u003Cfile>                  # full history of one side's hunk\ngh pr list --state merged --search \u003Cterm>    # the PR that introduced the change\ngh pr view \u003Cnum> ; gh issue view \u003Cnum>       # stated intent, linked tickets\n```\n\nRead commit messages, PR descriptions, and linked issues. The goal is the *original\nintent* behind each side, not just the textual difference.\n\n### 3. Resolve each hunk\n\nFor every hunk, in order of confidence:\n\n1. **Preserve both intents** where they are compatible — combine the two changes so\n   neither is lost. This is the default and most common outcome.\n2. **Where incompatible**, pick the side matching the **stated goal of the merge\u002Frebase**\n   (e.g. \"merge feature X into main\" → keep X's behaviour) and note the trade-off so the\n   discarded intent is visible to the user.\n3. Remove **all** conflict markers (`\u003C\u003C\u003C\u003C\u003C\u003C\u003C`, `=======`, `>>>>>>>`). Verify none remain:\n   `git grep -nE '^(\u003C{7}|={7}|>{7})' -- \u003Cfiles>` returns nothing.\n4. Stage each file as it is finished: `git add \u003Cfile>`.\n\nNever resolve by blindly taking one whole side (`-X ours`\u002F`-X theirs`) unless the file's\ntwo sides are genuinely one-or-the-other — that silently drops the other intent.\n\n### 4. Run the project's automated checks\n\nDiscover the checks before running them (do not assume). Typical order: **typecheck →\ntests → format.**\n\n```bash\ncat package.json        # scripts: typecheck \u002F lint \u002F test \u002F build \u002F format\nls Makefile justfile pyproject.toml Cargo.toml go.mod 2>\u002Fdev\u002Fnull\n```\n\nRun what exists (for example `cargo test` and `cargo clippy` in a Rust project, or the `typecheck`, `test` and `lint` scripts in `package.json`). Fix\nanything the merge broke — a resolution can be marker-free yet semantically wrong (e.g.\na function both sides renamed differently). Re-run until green.\n\n### 5. Obtain approval, then finish the merge\u002Frebase\n\n- **Ask first:** present the resolved files and check results. Do not run the following\n  commands until the user explicitly approves completion.\n- **Merge:** stage everything, then commit. The prepared message is usually correct;\n  keep it conventional and free of AI references.\n  ```bash\n  git add -A\n  git commit --no-edit        # or write a conventional message if none is prepared\n  ```\n- **Rebase:** continue, and **loop** — a rebase pauses once per conflicting commit.\n  ```bash\n  git add -A\n  git rebase --continue       # repeat steps 1-4 for each subsequent pause\n  ```\n  Repeat until `git status` reports the rebase is complete (no further stops).\n\nConfirm a clean tree (`git status` → \"nothing to commit, working tree clean\") before\nhanding off.\n\n## Output Format\n\n```\n## Merge Conflict Resolution: {merge|rebase} of {source} into {target}\n\n**Conflicted files:** {n}\n**Resolution summary:**\n- {file}: {kept both | chose {side} because {merge goal} — dropped {discarded intent}}\n\n**Checks:** typecheck {pass\u002Ffail} · tests {pass\u002Ffail} · format {pass\u002Ffail}\n**Finished:** {awaiting approval | commit sha | rebase complete}\n```\n\n## Failure Handling\n\n| Failure | Recovery |\n|---------|----------|\n| Cannot tell which side's intent should win | Surface both intents + the merge's stated goal to the user; ask — do NOT abort |\n| Checks fail after markers removed | Resolution is semantically wrong; re-read both sides' intent (step 2) and fix |\n| Conflict markers left in a file | `git grep -nE '^(\u003C{7}|={7}|>{7})'`; resolve remaining hunks before staging |\n| Rebase keeps re-conflicting on the same lines | Consider `git rerere`; otherwise resolve each pause carefully — never `--skip` a commit without user approval |\n| Binary file conflict | Choose a version explicitly (`git checkout --ours\u002F--theirs \u003Cfile>`) after confirming intent with the user |\n\n## Handoff Protocol\n\nOn a clean tree with green checks → return to `mk:ship` (if mid-ship) or `mk:verify` to\nconfirm the full build is green before continuing.\n\n## Gotchas\n\n- **`ours`\u002F`theirs` invert between merge and rebase** — during rebase, `ours` is the\n  upstream you are replaying onto, not your own work. Confirm direction before picking a side.\n- **Marker-free ≠ resolved** — code with no conflict markers can still be semantically\n  broken (both sides edited the same logic differently). Step 4's checks are what prove it.\n- **`git rebase --continue` pauses repeatedly** — one stop per conflicting commit. It is\n  not done until `git status` says so; resolving the first pause is not the end.",{"name":5,"description":7},"main","c7ff0a9e672de2c0590b03f6459385c2d7a63c1a","kit\u002Fbundles\u002Fcodex\u002Froot\u002F.agents\u002Fskills\u002Fmk-resolving-merge-conflicts",3,"https:\u002F\u002Fgithub.com\u002Fngocsangyem\u002FMeowKit","https:\u002F\u002Fdocs.meowkit.dev\u002F","https:\u002F\u002Fgithub.com\u002Fngocsangyem","Keep moving forward","2026-11-15 03:54:21",{"source":8,"skillName":5,"commands":34,"prompt":44,"zipAvailable":45},[35,38,41],{"tool":36,"command":37},"npx","npx skills add ngocsangyem\u002FMeowKit --skill mk-resolving-merge-conflicts",{"tool":39,"command":40},"bunx","bunx skills add ngocsangyem\u002FMeowKit --skill mk-resolving-merge-conflicts",{"tool":42,"command":43},"pnpm","pnpm dlx skills add ngocsangyem\u002FMeowKit --skill mk-resolving-merge-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fngocsangyem\u002FMeowKit\u002Fblob\u002Fmain\u002Fkit\u002Fbundles\u002Fcodex\u002Froot\u002F.agents\u002Fskills\u002Fmk-resolving-merge-conflicts\u002FSKILL.md",true,[],[48,55,62,69,76,83],{"skillNo":49,"name":50,"nameZh":6,"description":51,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":52,"categories":53,"keywords":54,"publishedAt":19},"01M7DVHF481B4J41T4855KGM50","mk-worktree","Manages git worktrees for parallel agent isolation: creates parallel\u002F{name}-{timestamp} branches, merges with conflict detection. NOT for user feature branches (use git worktree directly).","https:\u002F\u002Fgithub.com\u002Fngocsangyem\u002FMeowKit\u002Fblob\u002Fmain\u002Fkit\u002Fbundles\u002Fcursor\u002Froot\u002F.cursor\u002Fskills\u002Fmk-worktree\u002FSKILL.md",[],[],{"skillNo":56,"name":57,"nameZh":6,"description":58,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":59,"categories":60,"keywords":61,"publishedAt":19},"01M7DVHAWVKDKPB1EA3F1NC4JC","mk-workflow-orchestrator","Auto-invoked 7-phase workflow for complex-feature intent; fasttrack mode for pre-approved specs. NOT for explicit single tasks (mk:cook), green-field builds (mk:autobuild), or simple fixes (mk:fix).","https:\u002F\u002Fgithub.com\u002Fngocsangyem\u002FMeowKit\u002Fblob\u002Fmain\u002Fkit\u002Fbundles\u002Fcursor\u002Froot\u002F.cursor\u002Fskills\u002Fmk-workflow-orchestrator\u002FSKILL.md",[],[],{"skillNo":63,"name":64,"nameZh":6,"description":65,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":66,"categories":67,"keywords":68,"publishedAt":19},"01M7DVH6SYBHWW00TRZXCC56JW","mk-web-to-markdown","Fetch a URL and return clean markdown, for arbitrary external pages (blog, RFC, GitHub issue, vendor doc) not covered by mk:docs-finder. Static-only by default; opt-in JS rendering available.","https:\u002F\u002Fgithub.com\u002Fngocsangyem\u002FMeowKit\u002Fblob\u002Fmain\u002Fkit\u002Fbundles\u002Fcursor\u002Froot\u002F.cursor\u002Fskills\u002Fmk-web-to-markdown\u002FSKILL.md",[],[],{"skillNo":70,"name":71,"nameZh":6,"description":72,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":73,"categories":74,"keywords":75,"publishedAt":19},"01M7DVH3HGW47BX3PEF30JV6EJ","mk-vulnerability-scanner","Vulnerability analysis: OWASP Top 10, current threat landscape, supply chain security, attack surface mapping, risk prioritization. Use for security audits. NOT for STRIDE\u002FCSO infra audits (mk:cso).","https:\u002F\u002Fgithub.com\u002Fngocsangyem\u002FMeowKit\u002Fblob\u002Fmain\u002Fkit\u002Fbundles\u002Fcursor\u002Froot\u002F.cursor\u002Fskills\u002Fmk-vulnerability-scanner\u002FSKILL.md",[],[],{"skillNo":77,"name":78,"nameZh":6,"description":79,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":80,"categories":81,"keywords":82,"publishedAt":19},"01M7DVGZBKMB9WDFH9MFMA99FV","mk-vue","Vue 3 authoring\u002Freview: components, composables, reactivity, Pinia, Pinia Colada, file routing, forms. Composition API + script setup. Auto-activates on .vue files. Deep review: mk:vue-best-practices.","https:\u002F\u002Fgithub.com\u002Fngocsangyem\u002FMeowKit\u002Fblob\u002Fmain\u002Fkit\u002Fbundles\u002Fcursor\u002Froot\u002F.cursor\u002Fskills\u002Fmk-vue\u002FSKILL.md",[],[],{"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":19},"01M7DVGSE12AA1M7599HB8HRCT","mk-vue-testing-best-practices","Vue 3 testing best-practices review: Vitest + Vue Test Utils for components, composables, Pinia, Router, async\u002FSuspense, forms, a11y, plus Playwright E2E strategy. Advisory only.","https:\u002F\u002Fgithub.com\u002Fngocsangyem\u002FMeowKit\u002Fblob\u002Fmain\u002Fkit\u002Fbundles\u002Fcursor\u002Froot\u002F.cursor\u002Fskills\u002Fmk-vue-testing-best-practices\u002FSKILL.md",[],[]]