[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M7ADM3V2EP6V0CC22TAP1879":3,"skill-same:01M7ADM3V2EP6V0CC22TAP1879":49},{"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":27,"commitSha":28,"skillDirectory":29,"forksCount":30,"repositoryHtmlUrl":31,"repositoryHomepageUrl":32,"ownerHtmlUrl":33,"ownerBlogUrl":6,"ownerDescription":6,"updatedAt":34,"install":35,"resources":48},"01M7ADM3V2EP6V0CC22TAP1879","git-workflows",null,"Use when managing branches, writing commits, creating isolated worktrees for feature work, or resolving and verifying merge\u002Frebase conflicts.","Leostruka\u002Fdevin-bundle","Leostruka","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F81370685?v=4","01M7AD8MAK63VDNAWRDRRRW04N","leandro ostruka","01M7AD8MBS65YDS1KMMV7YPM07",0,"MIT","https:\u002F\u002Fgithub.com\u002FLeostruka\u002Fdevin-bundle\u002Fblob\u002Fmain\u002Fskills\u002Fgit-workflows\u002FSKILL.md",[],[],"2026-11-15 14:19:17",false,"---\nname: git-workflows\ndescription: Use when managing branches, writing commits, creating isolated worktrees for feature work, or resolving and verifying merge\u002Frebase conflicts.\ntriggers: [user, model]\n---\n\n# Git Workflows\n\nBranches, commits, isolated worktrees, and merge-conflict resolution.\n\n## Branches & commits\n\n- `git checkout -b feature\u002F\u003Cname>` \u002F `git push -u origin feature\u002F\u003Cname>`.\n- Conventional commits: `type(scope): description` — feat, fix, docs, style,\n  refactor, test, chore. Subject ≤72 chars; atomic commits (one logical change).\n- Pull latest before branching; prefixes: feature\u002F, bugfix\u002F, hotfix\u002F.\n- Cleanup: `git remote prune origin`, `git branch -d \u003Cname>`.\n\n## Worktrees (isolated workspaces)\n\nCore principle: detect existing isolation → prefer native tools → git\nfallback. Never fight the harness.\n\n**Step 0 — detect existing isolation:**\n\n```bash\nGIT_DIR=$(cd \"$(git rev-parse --git-dir)\" && pwd -P)\nGIT_COMMON=$(cd \"$(git rev-parse --git-common-dir)\" && pwd -P)\ngit rev-parse --show-superproject-working-tree 2>\u002Fdev\u002Fnull  # submodule guard\n```\n\n`GIT_DIR != GIT_COMMON` and not a submodule → already in a linked worktree;\nskip creation. In a submodule → treat as normal repo.\n\n**Step 1a — native worktree tool preferred** (`EnterWorktree`, `\u002Fworktree`,\n`--worktree` flag): use it — it owns placement, branching, cleanup. Manual\n`git worktree add` alongside a native tool creates phantom state.\n\n**Step 1b — git fallback** (no native tool): pick directory in priority\norder — explicit user instruction → existing `.worktrees\u002F` → `worktrees\u002F` →\ndefault `.worktrees\u002F`. MUST `git check-ignore -q \u003Cdir>` first; if not\nignored, add to `.gitignore` and commit. Then:\n\n```bash\ngit worktree add \"$path\" -b \"$BRANCH_NAME\" && cd \"$path\"\n```\n\nPermission error → sandbox fallback: work in place.\n\n**Step 2 — setup:** auto-detect (package.json→npm install, Cargo.toml→cargo\nbuild, requirements.txt\u002Fpyproject.toml→pip\u002Fpoetry, go.mod→go mod download).\n\n**Step 3 — baseline:** run project tests; failures → report + ask, passes →\n\"Worktree ready at \u003Cpath>, \u003CN> tests passing\".\n\nRationalizations to reject: \"obviously not in a worktree\" (run Step 0),\n\"worktree add is quicker\" (native tool owns lifecycle), \"surely ignored\"\n(run check-ignore), \"baseline can wait\" (dirty baseline makes later failures\nambiguous).\n\n### Multiple lanes (parallel agents)\n\nFor risky refactors, spikes, or parallel subagents, manage each worktree as\na named **lane**; the controller (orchestrator) owns lane planning,\nbranch\u002Fpath selection, file ownership, delegation, diff validation,\nintegration, and cleanup. Subagents work inside their assigned lane only.\n\n- **Lane manifest**: optional local metadata `.devin\u002Fworktrees.json`\n  tracking `slug`, `branch`, `path`, `base`, `purpose`, `owner`, `status`,\n  `areas` (file\u002Ffolder ownership), `createdAt`. Treat as local workflow\n  metadata; ask before committing it to the repo.\n- **File ownership per lane**: record which paths each lane owns so\n  parallel agents do not collide; a lane that needs another lane's area\n  stops and reports instead of editing across boundaries.\n- **Subagent isolation**: set each subagent's working directory strictly\n  to its lane path; never modify the main checkout for lane work.\n- **Managed ignore blocks**: when a project convention tracks worktree\n  dirs in `.gitignore`, add them inside `BEGIN\u002FEND` managed markers and add\n  only missing lines; never duplicate or rewrite unrelated rules.\n- **Mandatory confirmation before git mutations**: worktree add\u002Fremove,\n  branch create\u002Fdelete\u002Frename, merge, rebase, cherry-pick, prune, and any\n  destructive command (`reset --hard`, `clean`, `push --force`, removing a\n  dirty worktree) each need explicit user confirmation for that operation.\n- **Integration**: before merging a lane: run verification proportional\n  to the changed behavior, show the diff against the integration base, and\n  get user confirmation. Integrate from the main checkout.\n- **Cleanup**: confirm no uncommitted changes, get approval, remove the\n  worktree, and mark the lane `archived` in the manifest.\n\n**Skip lanes for:** single-file changes, doc updates, minor fixes, and\nrepos with multi-submodule states worktrees cannot express.\n\n## Merge conflicts\n\n1. **See the state** — merge\u002Frebase status, history, conflicting files.\n2. **Find primary sources** — why each change was made: commit messages, PRs,\n   original issues (`gh` for GitHub).\n3. **Resolve each hunk** — preserve both intents where possible; where\n   incompatible, pick the one matching the merge's stated goal and note the\n   trade-off. Don't invent new behavior. Always resolve; never `--abort`.\n4. **Run the project's checks** — typecheck, tests, format. Fix what the\n   merge broke.\n5. **Finish** — stage, commit; `git rebase --continue` until done if rebasing.\n\n## Cross-skills\n\n- `finishing-a-development-branch` — when the branch\u002Fworktree is done.\n- `handoff` — pause and resume in a fresh session.\n- `gh` — read PRs\u002Fissues behind conflicting changes.\n- `adaptive-agenda-calendar-routine-engine` - Stage 5 versioned delivery (commits, PRs, issue wiring) delegates here together with `gh`, `pr`, `finishing-a-development-branch`.\n- `git-github-adaptive-engineering` - orchestrates flow choice and Fase Zero repo-state checks; this skill executes the branch\u002Fcommit\u002Fworktree depth.\n","# Git Workflows\n\nBranches, commits, isolated worktrees, and merge-conflict resolution.\n\n## Branches & commits\n\n- `git checkout -b feature\u002F\u003Cname>` \u002F `git push -u origin feature\u002F\u003Cname>`.\n- Conventional commits: `type(scope): description` — feat, fix, docs, style,\n  refactor, test, chore. Subject ≤72 chars; atomic commits (one logical change).\n- Pull latest before branching; prefixes: feature\u002F, bugfix\u002F, hotfix\u002F.\n- Cleanup: `git remote prune origin`, `git branch -d \u003Cname>`.\n\n## Worktrees (isolated workspaces)\n\nCore principle: detect existing isolation → prefer native tools → git\nfallback. Never fight the harness.\n\n**Step 0 — detect existing isolation:**\n\n```bash\nGIT_DIR=$(cd \"$(git rev-parse --git-dir)\" && pwd -P)\nGIT_COMMON=$(cd \"$(git rev-parse --git-common-dir)\" && pwd -P)\ngit rev-parse --show-superproject-working-tree 2>\u002Fdev\u002Fnull  # submodule guard\n```\n\n`GIT_DIR != GIT_COMMON` and not a submodule → already in a linked worktree;\nskip creation. In a submodule → treat as normal repo.\n\n**Step 1a — native worktree tool preferred** (`EnterWorktree`, `\u002Fworktree`,\n`--worktree` flag): use it — it owns placement, branching, cleanup. Manual\n`git worktree add` alongside a native tool creates phantom state.\n\n**Step 1b — git fallback** (no native tool): pick directory in priority\norder — explicit user instruction → existing `.worktrees\u002F` → `worktrees\u002F` →\ndefault `.worktrees\u002F`. MUST `git check-ignore -q \u003Cdir>` first; if not\nignored, add to `.gitignore` and commit. Then:\n\n```bash\ngit worktree add \"$path\" -b \"$BRANCH_NAME\" && cd \"$path\"\n```\n\nPermission error → sandbox fallback: work in place.\n\n**Step 2 — setup:** auto-detect (package.json→npm install, Cargo.toml→cargo\nbuild, requirements.txt\u002Fpyproject.toml→pip\u002Fpoetry, go.mod→go mod download).\n\n**Step 3 — baseline:** run project tests; failures → report + ask, passes →\n\"Worktree ready at \u003Cpath>, \u003CN> tests passing\".\n\nRationalizations to reject: \"obviously not in a worktree\" (run Step 0),\n\"worktree add is quicker\" (native tool owns lifecycle), \"surely ignored\"\n(run check-ignore), \"baseline can wait\" (dirty baseline makes later failures\nambiguous).\n\n### Multiple lanes (parallel agents)\n\nFor risky refactors, spikes, or parallel subagents, manage each worktree as\na named **lane**; the controller (orchestrator) owns lane planning,\nbranch\u002Fpath selection, file ownership, delegation, diff validation,\nintegration, and cleanup. Subagents work inside their assigned lane only.\n\n- **Lane manifest**: optional local metadata `.devin\u002Fworktrees.json`\n  tracking `slug`, `branch`, `path`, `base`, `purpose`, `owner`, `status`,\n  `areas` (file\u002Ffolder ownership), `createdAt`. Treat as local workflow\n  metadata; ask before committing it to the repo.\n- **File ownership per lane**: record which paths each lane owns so\n  parallel agents do not collide; a lane that needs another lane's area\n  stops and reports instead of editing across boundaries.\n- **Subagent isolation**: set each subagent's working directory strictly\n  to its lane path; never modify the main checkout for lane work.\n- **Managed ignore blocks**: when a project convention tracks worktree\n  dirs in `.gitignore`, add them inside `BEGIN\u002FEND` managed markers and add\n  only missing lines; never duplicate or rewrite unrelated rules.\n- **Mandatory confirmation before git mutations**: worktree add\u002Fremove,\n  branch create\u002Fdelete\u002Frename, merge, rebase, cherry-pick, prune, and any\n  destructive command (`reset --hard`, `clean`, `push --force`, removing a\n  dirty worktree) each need explicit user confirmation for that operation.\n- **Integration**: before merging a lane: run verification proportional\n  to the changed behavior, show the diff against the integration base, and\n  get user confirmation. Integrate from the main checkout.\n- **Cleanup**: confirm no uncommitted changes, get approval, remove the\n  worktree, and mark the lane `archived` in the manifest.\n\n**Skip lanes for:** single-file changes, doc updates, minor fixes, and\nrepos with multi-submodule states worktrees cannot express.\n\n## Merge conflicts\n\n1. **See the state** — merge\u002Frebase status, history, conflicting files.\n2. **Find primary sources** — why each change was made: commit messages, PRs,\n   original issues (`gh` for GitHub).\n3. **Resolve each hunk** — preserve both intents where possible; where\n   incompatible, pick the one matching the merge's stated goal and note the\n   trade-off. Don't invent new behavior. Always resolve; never `--abort`.\n4. **Run the project's checks** — typecheck, tests, format. Fix what the\n   merge broke.\n5. **Finish** — stage, commit; `git rebase --continue` until done if rebasing.\n\n## Cross-skills\n\n- `finishing-a-development-branch` — when the branch\u002Fworktree is done.\n- `handoff` — pause and resume in a fresh session.\n- `gh` — read PRs\u002Fissues behind conflicting changes.\n- `adaptive-agenda-calendar-routine-engine` - Stage 5 versioned delivery (commits, PRs, issue wiring) delegates here together with `gh`, `pr`, `finishing-a-development-branch`.\n- `git-github-adaptive-engineering` - orchestrates flow choice and Fase Zero repo-state checks; this skill executes the branch\u002Fcommit\u002Fworktree depth.\n",{"name":5,"triggers":24,"description":7},[25,26],"user","model","main","0032dd465157e15d3ddd16afb75f4fe2dc1a356c","skills\u002Fgit-workflows",1,"https:\u002F\u002Fgithub.com\u002FLeostruka\u002Fdevin-bundle","https:\u002F\u002Fleostruka.github.io\u002Fdevin-bundle\u002F","https:\u002F\u002Fgithub.com\u002FLeostruka","2026-11-15 05:19:58",{"source":8,"skillName":5,"commands":36,"prompt":46,"zipAvailable":47},[37,40,43],{"tool":38,"command":39},"npx","npx skills add Leostruka\u002Fdevin-bundle --skill git-workflows",{"tool":41,"command":42},"bunx","bunx skills add Leostruka\u002Fdevin-bundle --skill git-workflows",{"tool":44,"command":45},"pnpm","pnpm dlx skills add Leostruka\u002Fdevin-bundle --skill git-workflows","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002FLeostruka\u002Fdevin-bundle\u002Fblob\u002Fmain\u002Fskills\u002Fgit-workflows\u002FSKILL.md",true,[],[50,57,64,71,78,85],{"skillNo":51,"name":52,"nameZh":6,"description":53,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":54,"categories":55,"keywords":56,"publishedAt":19},"01M7E0K3MG2XC4FSRV0MK6SFR1","montador-de-ideias","Use when assembling, expanding, or elevating a raw project idea or initial prompt into an ultra-detailed, first-principles dossier and compiled master prompt with journalistic OSINT market research, Tech Lead and Staff Architect justifications, atomic and modular hardening\u002Foptimization, and high-impact contact surfaces.","https:\u002F\u002Fgithub.com\u002FLeostruka\u002Fdevin-bundle\u002Fblob\u002Fmain\u002Fskills\u002Fmontador-de-ideias\u002FSKILL.md",[],[],{"skillNo":58,"name":59,"nameZh":6,"description":60,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":61,"categories":62,"keywords":63,"publishedAt":19},"01M7E0J7JJWZ8QMK01RZ3B3C9Z","git-github-adaptive-engineering","Use when any task touches git history, GitHub issues\u002FPRs\u002Freleases\u002FCI, repo governance, or branch and merge decisions. Runs the Fase Zero situational-awareness battery, picks one of five delivery flows via the adaptive decision engine, and enforces commit\u002FPR information-density standards. Orchestrates the gh, git-workflows, github-actions, pr, and debug\u002Ffinish skills.","https:\u002F\u002Fgithub.com\u002FLeostruka\u002Fdevin-bundle\u002Fblob\u002Fmain\u002Fskills\u002Fgit-github-adaptive-engineering\u002FSKILL.md",[],[],{"skillNo":65,"name":66,"nameZh":6,"description":67,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":68,"categories":69,"keywords":70,"publishedAt":19},"01M7E0GJFRPFEVQQMXEM58EWDM","adaptive-agenda-calendar-routine-engine","Use when planning or executing work across hours, days, weeks, or sprints. Turns the calendar into a strict time-blocked agenda (HH:MM-HH:MM blocks carrying a routine profile, expected inputs, and a handoff output artifact), runs the 5-stage cognitive flow (Radar and Hunt -> Triage plus Steve Jobs conception -> workbench manifest -> >=32-cycle loop -> Close plus Open-Minded Scrum), and unfolds macro calendar milestones into micro agenda blocks through extensions\u002Fgcal\u002Fwrapper.py.","https:\u002F\u002Fgithub.com\u002FLeostruka\u002Fdevin-bundle\u002Fblob\u002Fmain\u002Fskills\u002Fadaptive-agenda-calendar-routine-engine\u002FSKILL.md",[],[],{"skillNo":72,"name":73,"nameZh":6,"description":74,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":75,"categories":76,"keywords":77,"publishedAt":19},"01M7AE2K9FTY0BVS48N0A9JFKF","demo","Use when demonstrating a skill in a fixture project.","https:\u002F\u002Fgithub.com\u002FLeostruka\u002Fdevin-bundle\u002Fblob\u002Fmain\u002Ftests\u002Ffixtures\u002Fdevin-config\u002Fproject\u002F.devin\u002Fskills\u002Fdemo\u002FSKILL.md",[],[],{"skillNo":79,"name":80,"nameZh":6,"description":81,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":82,"categories":83,"keywords":84,"publishedAt":19},"01M7AE2G3DP38PTV3B1N7MW5TS","duplicate-skill","Use when testing duplicate skill name detection.","https:\u002F\u002Fgithub.com\u002FLeostruka\u002Fdevin-bundle\u002Fblob\u002Fmain\u002Ftests\u002Ffixtures\u002Fdevin-config\u002Fproject\u002F.devin\u002Fskills\u002Fbeta\u002FSKILL.md",[],[],{"skillNo":86,"name":80,"nameZh":6,"description":81,"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},"01M7AE2DBR8ZHT6T875MJ392GK","https:\u002F\u002Fgithub.com\u002FLeostruka\u002Fdevin-bundle\u002Fblob\u002Fmain\u002Ftests\u002Ffixtures\u002Fdevin-config\u002Fproject\u002F.devin\u002Fskills\u002Falpha\u002FSKILL.md",[],[]]