Update to Headcount: Technology

{
  "description": "Isolates feature work in its own branch or worktree and integrates it cleanly when done. Use this when starting work that should not disturb the current workspace, when several efforts must proceed in parallel on one repository, or when implementation is finished and the change needs merging, rebasing, or splitting for review.",
  "included_files": [
    {
      "relative_path": "references/sources.md",
      "size_in_bytes": 1498
    }
  ],
  "name": "branch-and-worktree-workflow",
  "skill_md_contents": "---\nname: branch-and-worktree-workflow\ndescription: Isolates feature work in its own branch or worktree and integrates it cleanly when done. Use this when starting work that should not disturb the current workspace, when several efforts must proceed in parallel on one repository, or when implementation is finished and the change needs merging, rebasing, or splitting for review.\n---\n\n# Branch and worktree workflow\n\n## Starting\n\nWork that will take more than one sitting, or that runs alongside other work, gets its own isolated\nworkspace. A worktree gives you a second checkout of the same repository on a different branch — two\nefforts, two directories, one object store, no stashing.\n\nBranch from the current upstream default, not from whatever is checked out. Branching off a stale\nlocal branch is how unrelated commits end up in a review.\n\n## While working\n\n- Commit at points where the tree is coherent, not at the end of the day.\n- Keep the branch current with its base often. A merge conflict found on day one is a five-minute\n  fix; the same conflict found on day ten is an afternoon.\n- One concern per branch. If you find an unrelated bug, note it and leave it.\n\n## Finishing\n\nBefore proposing the work:\n\n1. Rerun the full check the project actually gates on, not the subset you have been running.\n2. Read your own diff top to bottom. Remove debug output, stray files, and commented-out code.\n3. Confirm the branch merges cleanly into its base.\n\nThen decide how it integrates:\n\n- **Small and coherent** — merge as is.\n- **Several separable concerns** — split into stacked branches so each can be reviewed on its\n  merits. A reviewer given three concerns in one diff reviews none of them well.\n- **Exploratory** — keep the useful commits, drop the rest.\n\n## Sources\n\n`references/sources.md` in this skill lists the outside authorities that settle the questions\nhere — what each one is authoritative for, and what you may do with it. Check them before\nanswering on anything they cover, and cite what you used. Most are free to read and not free\nto reproduce; the use note on each is binding.\n\n## Never\n\n- Rewrite history on a branch someone else has checked out. Merge instead; a force-push breaks their\n  working copy.\n- Leave a worktree behind after merging — stale worktrees hold references and confuse later work.\n- Merge your own change without the checks green on the final commit, not an earlier one.\n"
}