[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M6BX781V7YFJGEF73W8EC29V":3,"skill-same:01M6BX781V7YFJGEF73W8EC29V":52},{"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":25,"linkOnly":26,"markdownContent":27,"markdownBody":28,"frontMatter":29,"refName":32,"commitSha":33,"skillDirectory":34,"forksCount":14,"repositoryHtmlUrl":35,"repositoryHomepageUrl":6,"ownerHtmlUrl":36,"ownerBlogUrl":37,"ownerDescription":6,"updatedAt":38,"install":39,"resources":51},"01M6BX781V7YFJGEF73W8EC29V","rebase-context",null,"Rebase one context branch onto another in the context repo, resolving glossary + ADR conflicts as you go. Use when the base a branch forked from has advanced, or to re-parent a context branch. Distinct from merge-context (reconcile into trunk via merge) and offload-context (commit + push, no cross-branch).","epr3\u002Fdotfiles","epr3","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F17836403?v=4","01M6BX69256YXCM19NTC0GJZ65","Eduard Predescu","01M6BX696ESQMPA9YYH6XXR72R",0,"MIT","https:\u002F\u002Fgithub.com\u002Fepr3\u002Fdotfiles\u002Fblob\u002Fmain\u002Fskills\u002Frebase-context\u002FSKILL.md",[],[19,20,21,22,23,24],"rebase","rebase context","go","commit","merge","push","2026-11-10 10:12:30",false,"---\nname: rebase-context\ndescription: Rebase one context branch onto another in the context repo, resolving glossary + ADR conflicts as you go. Use when the base a branch forked from has advanced, or to re-parent a context branch. Distinct from merge-context (reconcile into trunk via merge) and offload-context (commit + push, no cross-branch).\nargument-hint: \"\u003Csource> onto \u003Conto>: branch whose context to rebase, and the branch to rebase it onto (source defaults to the current branch; onto defaults to its base)\"\ndisable-model-invocation: true\n---\n\n# Rebase Context\n\nResolve the **context store** first: [GLOSSARY-FORMAT.md](..\u002Fdomain-modeling\u002FGLOSSARY-FORMAT.md) → *Resolving the context store*. **In-repo context** → this skill is a no-op; say so and stop.\n\nUnder a **context repo**, replay a source context branch's commits on top of a target so its history sits linearly on top of where it's now based. This is `git rebase` between two context branches plus conflict resolution with the glossary discipline in `merge-context`. See [GLOSSARY-FORMAT.md](..\u002Fdomain-modeling\u002FGLOSSARY-FORMAT.md) → *Publish + reconcile across branches*.\n\nTypical use: a branch's context was forked off its base (e.g. `feature-3` off `feature-2`); the base has since advanced, so you rebase the branch's context onto the updated base to stay current and linear. Bringing a branch **into** the context trunk is reconciliation (a merge), not a rebase; use `merge-context`.\n\n## Process\n\n### 1. Resolve source + onto\n\nParse the argument as `[\u003Csource>] onto \u003Conto>`. Source context branch: the named branch, else the current code branch's context. Onto: the named target, else the source's recorded **base**: the fork parent `ctx-init.sh` persisted for that context branch at fork time; read it at `${AGENT_CONTEXT_HOME:-${XDG_DATA_HOME:-$HOME\u002F.local\u002Fshare}\u002Fagent\u002Fctx}\u002F\u003Cslug>\u002F.git\u002Finfo\u002Ffork-parent\u002F\u003Cbranch>` (slug formula in [GLOSSARY-FORMAT.md](..\u002Fdomain-modeling\u002FGLOSSARY-FORMAT.md) → *Layout*), with cwd inside the code repo. An absent record falls back to the designated master. An explicit named `onto` always wins. Both are branches in this repo's **context repo**, their **context worktree**s pairing 1:1 with the code branches. Resolve the source **context worktree**; ensure `onto` exists (materialise its **context worktree** if needed). Confirm direction before any rewrite: the rebase **rewrites the source branch** on top of `onto`; `onto` is read, never changed.\n\n### 2. Rebase\n\nIn the source **context worktree**, replay onto the target: `git rebase \u003Conto>`. Clean commits apply untouched; the first conflicting commit stops the rebase for resolution. `git rebase --abort` at any point restores the branch exactly; nothing is lost.\n\n### 3. Resolve each conflict by meaning\n\nAt each stop git marks the conflicted files. Resolve by **meaning**, not just markers, running `merge-context`'s classify-and-interview discipline over the conflicted glossary and unioning ADRs by date-slug (superseding, never deleting). Pause the rebase on any divergence, alias clash, or ADR contradiction for review; never auto-pick meaning.\n\nStage the resolved files (`git add`) and `git rebase --continue`; repeat until the rebase finishes.\n\n### 4. Ground against the source's code\n\nThe authoritative universe after a rebase is the **source code worktree**, never onto's. Take its path universe via `\u003Csetup-context skill dir>\u002Fmanifest.sh`, invoked by path with **cwd anywhere inside the source code worktree**. Follow *Running the helper scripts* in [GLOSSARY-FORMAT.md](..\u002Fdomain-modeling\u002FGLOSSARY-FORMAT.md). A `\u003Cdir>\u002FGLOSSARY.md`, a term keyed to a missing module, or an ADR about absent code that the source's manifest lacks is **dangling**: surface it as a report + question and keep all context content until the user decides: never silently keep or drop anything. A dangling base-inherited path (present on onto, absent from the source) says \"context rebased before code\".\n\nSource-only feature paths stay valid: they exist on the source, just not on the base. This step completes once every dangling reference is surfaced and decided; grounding alone drops nothing.\n\n### 5. Finish\n\nRefresh the index with `\u003Csetup-context skill dir>\u002Fctx-index.sh`. Report: rebased `\u003Csource>` onto `\u003Conto>`, conflicts resolved, anything held or flagged dangling. Because the history is rewritten, republishing an already-pushed branch needs `git push --force-with-lease`; a deliberate act. Never force a shared trunk.\n","# Rebase Context\n\nResolve the **context store** first: [GLOSSARY-FORMAT.md](..\u002Fdomain-modeling\u002FGLOSSARY-FORMAT.md) → *Resolving the context store*. **In-repo context** → this skill is a no-op; say so and stop.\n\nUnder a **context repo**, replay a source context branch's commits on top of a target so its history sits linearly on top of where it's now based. This is `git rebase` between two context branches plus conflict resolution with the glossary discipline in `merge-context`. See [GLOSSARY-FORMAT.md](..\u002Fdomain-modeling\u002FGLOSSARY-FORMAT.md) → *Publish + reconcile across branches*.\n\nTypical use: a branch's context was forked off its base (e.g. `feature-3` off `feature-2`); the base has since advanced, so you rebase the branch's context onto the updated base to stay current and linear. Bringing a branch **into** the context trunk is reconciliation (a merge), not a rebase; use `merge-context`.\n\n## Process\n\n### 1. Resolve source + onto\n\nParse the argument as `[\u003Csource>] onto \u003Conto>`. Source context branch: the named branch, else the current code branch's context. Onto: the named target, else the source's recorded **base**: the fork parent `ctx-init.sh` persisted for that context branch at fork time; read it at `${AGENT_CONTEXT_HOME:-${XDG_DATA_HOME:-$HOME\u002F.local\u002Fshare}\u002Fagent\u002Fctx}\u002F\u003Cslug>\u002F.git\u002Finfo\u002Ffork-parent\u002F\u003Cbranch>` (slug formula in [GLOSSARY-FORMAT.md](..\u002Fdomain-modeling\u002FGLOSSARY-FORMAT.md) → *Layout*), with cwd inside the code repo. An absent record falls back to the designated master. An explicit named `onto` always wins. Both are branches in this repo's **context repo**, their **context worktree**s pairing 1:1 with the code branches. Resolve the source **context worktree**; ensure `onto` exists (materialise its **context worktree** if needed). Confirm direction before any rewrite: the rebase **rewrites the source branch** on top of `onto`; `onto` is read, never changed.\n\n### 2. Rebase\n\nIn the source **context worktree**, replay onto the target: `git rebase \u003Conto>`. Clean commits apply untouched; the first conflicting commit stops the rebase for resolution. `git rebase --abort` at any point restores the branch exactly; nothing is lost.\n\n### 3. Resolve each conflict by meaning\n\nAt each stop git marks the conflicted files. Resolve by **meaning**, not just markers, running `merge-context`'s classify-and-interview discipline over the conflicted glossary and unioning ADRs by date-slug (superseding, never deleting). Pause the rebase on any divergence, alias clash, or ADR contradiction for review; never auto-pick meaning.\n\nStage the resolved files (`git add`) and `git rebase --continue`; repeat until the rebase finishes.\n\n### 4. Ground against the source's code\n\nThe authoritative universe after a rebase is the **source code worktree**, never onto's. Take its path universe via `\u003Csetup-context skill dir>\u002Fmanifest.sh`, invoked by path with **cwd anywhere inside the source code worktree**. Follow *Running the helper scripts* in [GLOSSARY-FORMAT.md](..\u002Fdomain-modeling\u002FGLOSSARY-FORMAT.md). A `\u003Cdir>\u002FGLOSSARY.md`, a term keyed to a missing module, or an ADR about absent code that the source's manifest lacks is **dangling**: surface it as a report + question and keep all context content until the user decides: never silently keep or drop anything. A dangling base-inherited path (present on onto, absent from the source) says \"context rebased before code\".\n\nSource-only feature paths stay valid: they exist on the source, just not on the base. This step completes once every dangling reference is surfaced and decided; grounding alone drops nothing.\n\n### 5. Finish\n\nRefresh the index with `\u003Csetup-context skill dir>\u002Fctx-index.sh`. Report: rebased `\u003Csource>` onto `\u003Conto>`, conflicts resolved, anything held or flagged dangling. Because the history is rewritten, republishing an already-pushed branch needs `git push --force-with-lease`; a deliberate act. Never force a shared trunk.\n",{"name":5,"description":7,"argument-hint":30,"disable-model-invocation":31},"\u003Csource> onto \u003Conto>: branch whose context to rebase, and the branch to rebase it onto (source defaults to the current branch; onto defaults to its base)",true,"main","65bf09779e3f07885f06c48871a49186950e4f73","skills\u002Frebase-context","https:\u002F\u002Fgithub.com\u002Fepr3\u002Fdotfiles","https:\u002F\u002Fgithub.com\u002Fepr3","https:\u002F\u002Feduar.dev","2026-11-14 21:58:53",{"source":8,"skillName":5,"commands":40,"prompt":50,"zipAvailable":31},[41,44,47],{"tool":42,"command":43},"npx","npx skills add epr3\u002Fdotfiles --skill rebase-context",{"tool":45,"command":46},"bunx","bunx skills add epr3\u002Fdotfiles --skill rebase-context",{"tool":48,"command":49},"pnpm","pnpm dlx skills add epr3\u002Fdotfiles --skill rebase-context","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fepr3\u002Fdotfiles\u002Fblob\u002Fmain\u002Fskills\u002Frebase-context\u002FSKILL.md",[],[53,73,88,97,106,116],{"skillNo":54,"name":55,"nameZh":6,"description":56,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":57,"categories":58,"keywords":69,"publishedAt":25},"01M6BX801Z8NPQWTCRDMW3SX7S","writing-for-agents","Writing documents for agents. Use when creating or editing skills, or modifying AGENTS.md or CLAUDE.md.","https:\u002F\u002Fgithub.com\u002Fepr3\u002Fdotfiles\u002Fblob\u002Fmain\u002Fskills\u002Fwriting-for-agents\u002FSKILL.md",[59,64],{"categoryNo":60,"categoryName":61,"taxonomyType":62,"taxonomyTypeDesc":63},"01JBSEEDCAT000000000000018","写作与文案","SCENARIO","使用场景",{"categoryNo":65,"categoryName":66,"taxonomyType":67,"taxonomyTypeDesc":68},"01JBSEEDCAT000000000000036","内容创作者","PROFESSION","适用职业",[70,71,72],"writing for agents","writing","documents",{"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":25},"01M6BX7XYN6BGV4QVHQDV3P0BN","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\u002Fepr3\u002Fdotfiles\u002Fblob\u002Fmain\u002Fskills\u002Fwizard\u002FSKILL.md",[],[75,80,81,82,83,84,85,86,87],"ci","infrastructure","secrets","Bash","generate","dashboard","provisioning","credentials",{"skillNo":89,"name":90,"nameZh":6,"description":91,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":92,"categories":93,"keywords":94,"publishedAt":25},"01M6BX7WS9T1Z0ERRAAMYVZB1J","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\u002Fepr3\u002Fdotfiles\u002Fblob\u002Fmain\u002Fskills\u002Fwayfinder\u002FSKILL.md",[],[90,95,96],"plan","chunk",{"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":25},"01M6BX7V35DB7K3MW5GWNSVTSG","wait-what","Stop. That last message did not land: re-pitch it.","https:\u002F\u002Fgithub.com\u002Fepr3\u002Fdotfiles\u002Fblob\u002Fmain\u002Fskills\u002Fwait-what\u002FSKILL.md",[],[104,105],"wait what","land",{"skillNo":107,"name":108,"nameZh":6,"description":109,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":110,"categories":111,"keywords":112,"publishedAt":25},"01M6BX7S81DD62SEEM2HCBWK7P","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\u002Fepr3\u002Fdotfiles\u002Fblob\u002Fmain\u002Fskills\u002Ftriage\u002FSKILL.md",[],[108,113,114,115],"issues","verify","state",{"skillNo":117,"name":118,"nameZh":6,"description":119,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":120,"categories":121,"keywords":122,"publishedAt":25},"01M6BX7QBN7VK4YWBM7PC4M5MG","to-tickets","Break a plan, spec, or the current conversation into a set of tracer-bullet tickets, each declaring its blocking edges, published to the configured tracker (edges as text in one file per ticket locally, or native blocking links on a real tracker).","https:\u002F\u002Fgithub.com\u002Fepr3\u002Fdotfiles\u002Fblob\u002Fmain\u002Fskills\u002Fto-tickets\u002FSKILL.md",[],[123,124,125,95,126,127],"to tickets","spec","file","SET","text"]