[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M755ARA11A2DFS0CHCPV1EVF":3,"skill-same:01M755ARA11A2DFS0CHCPV1EVF":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":25,"commitSha":26,"skillDirectory":27,"forksCount":14,"repositoryHtmlUrl":28,"repositoryHomepageUrl":6,"ownerHtmlUrl":29,"ownerBlogUrl":6,"ownerDescription":30,"updatedAt":31,"install":32,"resources":44},"01M755ARA11A2DFS0CHCPV1EVF","resolve-conflicts",null,"Resolve conflict markers left by a rebase, merge or cherry-pick, and orchestrate a stacked rebase.","javierponferradalopez\u002Fskills","javierponferradalopez","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F14855436?v=4","01M7558SVYVYNG1XCWZEFPK4E6","Javier Ponferrada López","01M7558SWMWTGK5WCJSVFNZ17Y",0,"MIT","https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez\u002Fskills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fresolve-conflicts\u002FSKILL.md",[],[],"2026-11-12 13:55:43",false,"---\nname: resolve-conflicts\ndescription: \"Resolve conflict markers left by a rebase, merge or cherry-pick, and orchestrate a stacked rebase.\"\ndisable-model-invocation: true\n---\n\n# Resolve conflicts\n\nResolve every conflict by **intent** — what each side was trying to do — and hunt the **silent breaks** git never marks. Propose, then act only on an explicit OK.\n\n## The gate\n\nTwo moments hand control back to the user:\n\n1. A proposed resolution, before any file is edited.\n2. Every command that moves git state — `add`, `--continue`, `commit`, `push`.\n\nAt each, show the proposal and **stop**. `OK` \u002F `ok` \u002F `dale` \u002F `vale` proceeds. `OK, but \u003Cchange>` → adjust, re-show, wait. Anything else → adjust, re-show, wait.\n\nReading is free: inspect the repository as deeply as the resolution needs, no gate.\n\n## 1. Find the door\n\n```bash\ngit status\n```\n\n- **Nothing in progress** → step 2.\n- **Conflict already on disk** → step 3. The map step 2 draws would no longer change a decision.\n\n## 2. Recon and plan\n\nPredict the conflicts without touching the index or the working tree:\n\n```bash\ngit merge-tree --write-tree --name-only \u003Cupstream> \u003Cbranch>\n```\n\nFor every file it reports, name the upstream commits that touch it — `git log --oneline \u003Cmerge-base>..\u003Cupstream> -- \u003Cfile>` — so the user sees what is landing before running anything.\n\n**More than one branch in play → read [`STACKED-BRANCHES.md`](STACKED-BRANCHES.md) now.** A stack rebased branch by branch reconflicts itself, and the cut point has to be chosen before the first command.\n\nPresent the map, then propose the first command.\n\n## 3. Resolve, file by file\n\nFor each conflicted file:\n\n- Read the three stages — `git show :1:\u003Cpath>` (common ancestor), `:2:` (ours), `:3:` (theirs). Under `zdiff3`\u002F`diff3`, the middle marker section is the ancestor.\n- **In a rebase, `ours` is the new base and `theirs` is the commit being replayed** — your own work is `theirs`.\n- Read the commit behind the other side with `git log -p`, so the resolution answers what each side was for.\n- Read what git auto-merged in the same file. Those hunks hold the evidence for the resolution, and they are where a **silent break** hides.\n\nTwo shapes: an **adjacency conflict** — each side added a neighbour, a field, a method, an import — usually keeps both sides; a **semantic conflict**, where both sides changed the same behaviour, is decided by the intent behind each.\n\nPropose in this shape:\n\n```\n`path\u002Fto\u002Ffile.ts` — adjacency | semantic\n\n- **ours** (`\u003Csha>` \u003Csubject>): \u003Cwhat it did>\n- **theirs** (`\u003Csha>` \u003Csubject>): \u003Cwhat it did>\n\n\u003Cthe resolved block>\n\nEvidence: \u003Cwhat in the code already proves this>\n```\n\n**The evidence carries the proposal.** A resolution the user can approve without opening the file is one that cites what already proves it: the auto-merged `build()` that references both fields, the test upstream added for that very case. Where none exists, say so and name the command that will produce it.\n\n## 4. Verify the stop, then continue\n\nEvery conflicted file resolved means: no marker survives, the code type-checks, and the specs covering the touched files pass — with whatever commands the project defines for those.\n\nThen propose staging and continuing. `--continue` runs under `GIT_EDITOR=true`, so it takes the existing message instead of waiting on an editor.\n\nBack to step 3 for the next stop.\n\n## 5. Verify the branch\n\nThe last commit applying is not the end — it is where **silent breaks** surface: hunks that auto-merged clean and no longer compile, because upstream deleted a field, renamed a type or wrapped a return value.\n\nDone when **everything the replayed commits touch** type-checks and passes its tests — every app, package and workspace they reach, not only the one in front of you. `git log --name-only \u003Cupstream>..\u003Cbranch>` is that list.\n\nWhere the fix lands:\n\n- The break belongs to the commit being applied right now → fix it before `--continue`, so it ships inside that commit.\n- The rebase already finished → one adaptation commit at the tip.\n- It spans several commits, and each of them compiling on its own is worth a second pass → offer `git commit --fixup=\u003Csha>` per commit plus `git rebase -i --autosquash`.\n\n## 6. Close\n\nPropose the push. `--force-with-lease` protects a rebased branch by comparing the remote against your remote-tracking ref, so push with that ref as you last saw it: a `fetch` first makes the lease expect whatever someone else pushed, and the force succeeds over their work.\n\nPush a stack's branches back-to-back. Between the two pushes, the upper PR compares a rebased branch against a base that has not moved yet.\n\nWhere a branch has a PR, confirm its base ref still points where it did — `gh pr list --head \u003Cbranch>`.\n","# Resolve conflicts\n\nResolve every conflict by **intent** — what each side was trying to do — and hunt the **silent breaks** git never marks. Propose, then act only on an explicit OK.\n\n## The gate\n\nTwo moments hand control back to the user:\n\n1. A proposed resolution, before any file is edited.\n2. Every command that moves git state — `add`, `--continue`, `commit`, `push`.\n\nAt each, show the proposal and **stop**. `OK` \u002F `ok` \u002F `dale` \u002F `vale` proceeds. `OK, but \u003Cchange>` → adjust, re-show, wait. Anything else → adjust, re-show, wait.\n\nReading is free: inspect the repository as deeply as the resolution needs, no gate.\n\n## 1. Find the door\n\n```bash\ngit status\n```\n\n- **Nothing in progress** → step 2.\n- **Conflict already on disk** → step 3. The map step 2 draws would no longer change a decision.\n\n## 2. Recon and plan\n\nPredict the conflicts without touching the index or the working tree:\n\n```bash\ngit merge-tree --write-tree --name-only \u003Cupstream> \u003Cbranch>\n```\n\nFor every file it reports, name the upstream commits that touch it — `git log --oneline \u003Cmerge-base>..\u003Cupstream> -- \u003Cfile>` — so the user sees what is landing before running anything.\n\n**More than one branch in play → read [`STACKED-BRANCHES.md`](STACKED-BRANCHES.md) now.** A stack rebased branch by branch reconflicts itself, and the cut point has to be chosen before the first command.\n\nPresent the map, then propose the first command.\n\n## 3. Resolve, file by file\n\nFor each conflicted file:\n\n- Read the three stages — `git show :1:\u003Cpath>` (common ancestor), `:2:` (ours), `:3:` (theirs). Under `zdiff3`\u002F`diff3`, the middle marker section is the ancestor.\n- **In a rebase, `ours` is the new base and `theirs` is the commit being replayed** — your own work is `theirs`.\n- Read the commit behind the other side with `git log -p`, so the resolution answers what each side was for.\n- Read what git auto-merged in the same file. Those hunks hold the evidence for the resolution, and they are where a **silent break** hides.\n\nTwo shapes: an **adjacency conflict** — each side added a neighbour, a field, a method, an import — usually keeps both sides; a **semantic conflict**, where both sides changed the same behaviour, is decided by the intent behind each.\n\nPropose in this shape:\n\n```\n`path\u002Fto\u002Ffile.ts` — adjacency | semantic\n\n- **ours** (`\u003Csha>` \u003Csubject>): \u003Cwhat it did>\n- **theirs** (`\u003Csha>` \u003Csubject>): \u003Cwhat it did>\n\n\u003Cthe resolved block>\n\nEvidence: \u003Cwhat in the code already proves this>\n```\n\n**The evidence carries the proposal.** A resolution the user can approve without opening the file is one that cites what already proves it: the auto-merged `build()` that references both fields, the test upstream added for that very case. Where none exists, say so and name the command that will produce it.\n\n## 4. Verify the stop, then continue\n\nEvery conflicted file resolved means: no marker survives, the code type-checks, and the specs covering the touched files pass — with whatever commands the project defines for those.\n\nThen propose staging and continuing. `--continue` runs under `GIT_EDITOR=true`, so it takes the existing message instead of waiting on an editor.\n\nBack to step 3 for the next stop.\n\n## 5. Verify the branch\n\nThe last commit applying is not the end — it is where **silent breaks** surface: hunks that auto-merged clean and no longer compile, because upstream deleted a field, renamed a type or wrapped a return value.\n\nDone when **everything the replayed commits touch** type-checks and passes its tests — every app, package and workspace they reach, not only the one in front of you. `git log --name-only \u003Cupstream>..\u003Cbranch>` is that list.\n\nWhere the fix lands:\n\n- The break belongs to the commit being applied right now → fix it before `--continue`, so it ships inside that commit.\n- The rebase already finished → one adaptation commit at the tip.\n- It spans several commits, and each of them compiling on its own is worth a second pass → offer `git commit --fixup=\u003Csha>` per commit plus `git rebase -i --autosquash`.\n\n## 6. Close\n\nPropose the push. `--force-with-lease` protects a rebased branch by comparing the remote against your remote-tracking ref, so push with that ref as you last saw it: a `fetch` first makes the lease expect whatever someone else pushed, and the force succeeds over their work.\n\nPush a stack's branches back-to-back. Between the two pushes, the upper PR compares a rebased branch against a base that has not moved yet.\n\nWhere a branch has a PR, confirm its base ref still points where it did — `gh pr list --head \u003Cbranch>`.\n",{"name":5,"description":7,"disable-model-invocation":24},true,"master","04992213ead85fffed063682ca559e646fab6b82","skills\u002Fproductivity\u002Fresolve-conflicts","https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez\u002Fskills","https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez","Software Engineer ","2026-11-06 16:15:12",{"source":8,"skillName":5,"commands":33,"prompt":43,"zipAvailable":24},[34,37,40],{"tool":35,"command":36},"npx","npx skills add javierponferradalopez\u002Fskills --skill resolve-conflicts",{"tool":38,"command":39},"bunx","bunx skills add javierponferradalopez\u002Fskills --skill resolve-conflicts",{"tool":41,"command":42},"pnpm","pnpm dlx skills add javierponferradalopez\u002Fskills --skill resolve-conflicts","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez\u002Fskills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fresolve-conflicts\u002FSKILL.md",[45],{"path":46,"resourceType":47,"resourceTypeDesc":48,"sizeBytes":49,"sourceHtmlUrl":50},"STACKED-BRANCHES.md","REFERENCE","参考文档",1641,"https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez\u002Fskills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fresolve-conflicts\u002FSTACKED-BRANCHES.md",[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},"01M755BAHG2G5JGPT5R650ADN8","zoom-out","Tell the agent to zoom out and give broader context or a higher-level perspective. Use when you're unfamiliar with a section of code or need to understand how it fits into the bigger picture.","https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez\u002Fskills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fzoom-out\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},"01M755B8Z8MKT694CB19FEC6NR","writing-for-agents","Writing documents for agents. Use when creating or editing skills, or modifying AGENTS.md or CLAUDE.md.","https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez\u002Fskills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fwriting-for-agents\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},"01M755B2W1VQBC4MY04PJQR5CT","walkthrough","Build a throwaway HTML reading guide for a set of changes (dirty tree, local commits, or a PR): what it means for users and for the system, then an ordered walk through the code with links that open each file in the IDE. Orients the human; leaves every quality call to them.","https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez\u002Fskills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fwalkthrough\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},"01M755B09H61BH3ZR4CPCMEBDB","teach","Teach the user a new skill or concept, within this workspace.","https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez\u002Fskills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fteach\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},"01M755AX5DF1W73YZABYGFVN8W","suggest-reviewers","Suggest GitHub reviewers for the current branch's Pull Request by ranking the people who actually own and recently touched the changed files (git history + CODEOWNERS). Use when the user asks who should review this PR\u002Fbranch or wants reviewer suggestions. Also invoked as the final step of the github-pr skill.","https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez\u002Fskills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fsuggest-reviewers\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},"01M755AT748KXW4CKCYJHR7XB4","setup-skills","Sets up an `## Agent skills` block in AGENTS.md\u002FCLAUDE.md and `docs\u002Fagents\u002F` so the engineering skills know this repo's issue tracker (GitHub, GitLab, ClickUp, or local markdown), domain doc layout, and error tracking. Run as a first-time bootstrap for a repo, or if engineering skills appear to be missing context about the issue tracker, domain docs, or error tracker.","https:\u002F\u002Fgithub.com\u002Fjavierponferradalopez\u002Fskills\u002Fblob\u002Fmaster\u002Fskills\u002Fproductivity\u002Fsetup-skills\u002FSKILL.md",[],[]]