Skip to content

aasimahmed177-web/LT-2 / .claude/skills/git-workflow

git-workflow

Verified

Use when establishing branching strategies, implementing Conventional Commits, creating or reviewing PRs, resolving PR review comments, merging PRs (including CI verification, auto-merge queues, and post-merge cleanup), managing PR review threads, merging PRs with signed commits, handling merge conflicts, creating releases, integrating Git with CI/CD, setting up git hooks (lefthook, captainhook, husky, pre-commit), or debugging hook-install failures in git worktrees.

Git Workflow Skill

Expert patterns for Git: branching, commits, collaboration, CI/CD.

Critical Rules (Non-Negotiable)

  1. No direct push to main — always open a PR.
  2. No merge before all threads resolved — see references/pull-request-workflow.md.
  3. No squash unless asked — preserves atomic commits, signatures, bisection.
  4. No "tested/verified/working" without pasted command output — else say so.
  5. No edits to installed skill/plugin cache paths (~/.claude/skills/, ~/.claude/plugins/cache/, **/.bare/**) — always the repo worktree, verified by pwd.
  6. Force-push only with --force-with-lease — never plain --force.
  7. Commit before rebase — add → commit → fetch → rebase → push. Dirty tree aborts rebase.

See references/pull-request-workflow.md for merge-gate and atomic-commit patterns.

Reference Files

Load references on demand:

ReferenceContent Triggers
references/branching-strategies.mdBranching model, Git Flow, GitHub Flow, trunk-based, branch protection
references/commit-conventions.mdCommit messages, conventional commits, DCO sign-off, semantic versioning, commitlint
references/pull-request-workflow.mdPR create/review/merge, thread resolution, merge strategies, CODEOWNERS, signed commits + rebase
references/ci-cd-integration.mdGitHub Actions, GitLab CI, semantic release, deployment
references/advanced-git.mdRebase, cherry-pick, bisect, stash, worktrees, reflog, submodules, recovery
references/github-releases.mdRelease management, immutable releases, --latest=false, multi-branch
references/git-hooks-setup.mdHook frameworks, detection, recommended hooks per stage
references/claude-code-hooks.mdClaude Code settings.json hooks — merge gate, cache-path rejection, auto-lint
references/code-quality-tools.mdshellcheck, shfmt, git-absorb, difftastic
references/merge-gate-watcher.mdMerge-driver loop, hard/soft check taxonomy, rerun stale-SHA, review-bot rounds
references/spec-cleanup.mdKeep planning artifacts off the base branch; guard + capture-to-ADR

Conventional Commits

<type>[scope]: <description>

Types: feat (MINOR), fix (PATCH), docs, style, refactor, perf, test, build, ci, chore, revert

Breaking change: Add ! after type or BREAKING CHANGE: in footer.

Branch Naming

feature/TICKET-123-description
fix/TICKET-456-bug-name
release/1.2.0
hotfix/1.2.1-security-patch

Hook Detection

Detect hooks before first commit:

ls lefthook.yml .lefthook.yml captainhook.json .pre-commit-config.yaml .husky/pre-commit 2>/dev/null || echo "No hooks"

Install: lefthook install | composer install | npm install | pre-commit install

Critical Release Rules

  1. Immutable releases: deleted releases block tag reuse; bump version.
  2. Multi-branch releases: Use --latest=false from non-default branches.
  3. Pre-release: Version bumped, CI green, CHANGELOG updated, git pull BEFORE gh release create.

PR Merge Requirements

Before merging: threads resolved, CI green (incl. annotations), rebased, signed. Rebase-only + signed: git merge --ff-only.

Verification

./scripts/verify-git-workflow.sh /path/to/repository

Contributing: https://github.com/netresearch/git-workflow-skill

writing-skillsobra/superpowersUse when creating new skills, editing existing skills, or verifying skills work before deploymentStars: 319kUpdated Claude CodeCodexVerifiedInstall
xlsxanthropics/skillsUse this skill any time a spreadsheet file is the primary input or output. This means any task where the user wants to: open, read, edit, or fix an existing .xlsx, .xlsm, .xltx, .csv, or .tsv file (e.g., adding columns, computing formulas, formatting, charting, cleaning messy data); create a new spreadsheet from scratch or from other data sources; or convert between tabular file formats. Trigger especially when the user references a spreadsheet file by name or path — even casually (like "the xlsx in my downloads") — and wants something done to it or produced from it. Also trigger for cleaning or restructuring messy tabular data files (malformed rows, misplaced headers, junk data) into proper spreadsheets. The deliverable must be a spreadsheet file. Do NOT trigger when the primary deliverable is a Word document, HTML report, standalone Python script, database pipeline, or Google Sheets API integration, even if tabular data is involved.Stars: 196kUpdated Claude CodeCodexVerifiedInstall
shipping-and-launchaddyosmani/agent-skillsPrepares production launches. Use when preparing to deploy to production, or when asking what needs to be in place before shipping. Use when you need a pre-launch checklist, when setting up monitoring, when planning a staged rollout, or when you need a rollback strategy.Stars: 118kUpdated Claude CodeCodexVerifiedInstall
childhoodthedotmack/claude-memBabysit a shipped release after merge, publication, or deployment. Verify published packages, production behavior, installed plugins, and late CI or user reports until the observation window is clean; use babysit for PR readiness before release.Stars: 117kUpdated Claude CodeCodexVerifiedInstall