jacobpevans/git-workflow-standards
git-standards/skills/git-workflow-standards/SKILL.md
Use when managing branches, resolving merge conflicts, syncing with main, or working with worktrees
$ install --global
skillsauthnpx skillsauth add jacobpevans/claude-code-plugins git-workflow-standardsInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Jun 7, 2026, 6:48 AM326.8s1 file scanned
SKILL.md
- name:
- git-workflow-standards
- description:
- Use when managing branches, resolving merge conflicts, syncing with main, or working with worktrees
Git Workflow Standards
Worktree Structure
All development uses dedicated worktrees. Never work directly on main. Create a worktree for the change; remove it when the work is done.
Every branch with commits MUST have an associated PR. Orphaned branches must get a PR or be deleted.
Stale worktree: A branch with no open PR, no uncommitted changes, and either a merged PR
whose headRefOid matches local HEAD, or a deleted remote ([gone]) with no commits ahead
of the default branch (git log origin/<default>..HEAD --oneline is empty). Branches with open
PRs, local-only branches without merged PRs, local commits beyond the merged PR head, and
worktrees with uncommitted changes are NEVER stale. Use git worktree remove (never --force)
— Git natively blocks removal of dirty worktrees.
Branch Hygiene
- Sync main daily:
git pull - Long-running branches: rebase from main weekly
- Before PRs: ensure branch is on latest main
- Never branch from feature branches — always from main
- Commit messages: conventional-commit prefixes only, no emoji (see
pr-standards)
| Method | When |
| --- | --- |
| git merge origin/main | Default — preserves history, safer |
| git rebase origin/main | Only if branch has NOT been pushed yet |
Sync main workflow:
git fetch origin main && git pull origin main # in main
git merge origin/main --no-edit # in the feature worktree
Merge Conflict Resolution
NEVER assume newer is correct. Analyze both versions.
- Understand — read full file, check
git log --oneline -10 -- <file> - Analyze — identify what each side changed and why, check compatibility
- Resolve — use the resolution table below
- Verify — run
pre-commit run --files <file>, read resolved file
| Scenario | Resolution | | --- | --- | | Additive changes | Keep both | | Same logic modified | Combine intent of both | | One is a bug fix | Always include the fix | | One is a refactor | Apply refactor, then add other change | | Truly incompatible | Prefer branch's changes, add comment |
Escalate to human review for complex business logic, fundamental contradictions, or security-sensitive code.
| Command | Purpose |
| --- | --- |
| git diff --name-only --diff-filter=U | List conflicted files |
| git log --merge -p <file> | Show commits causing conflict |
| git show :1:<file> | Common ancestor version |
| git show :2:<file> | HEAD (your branch) version |
| git show :3:<file> | Incoming (their branch) version |
| git merge --abort | Abort and return to pre-merge state |
Related Skills
- sync-main (git-workflows) — Syncs main and merges into current or all PR branches
- refresh-repo (git-workflows) — Full repo sync including PR status and worktree cleanup
- pr-standards (git-standards) — PR creation guards, issue linking, and review standards
Related Skills
jacobpevans/nix-tool-policy
tools
VerifiedTrustedCommunity
Use when installing or choosing CLI tools in a Nix flake repo, editing flake.nix or home-manager config, or when tempted to pip/pipx/uv/brew/npm install anything. Tools come from the dev shell or nix shell — never ad-hoc package managers.
3SKILL.mdUpdated Jun 11, 2026
jacobpevans/shared-workflow-org-refs
testing
VerifiedTrustedCommunity
Use when creating or editing GitHub Actions workflows that call reusable workflows (uses: OWNER/repo/.github/workflows/...) — org owner references must be the literal current org, and shared-CI homes are under dryvist.
3SKILL.mdUpdated Jun 11, 2026
jacobpevans/pre-commit-architecture
development
VerifiedTrustedCommunity
Use when adding or editing .pre-commit-config.yaml, wiring pre-commit hooks into a repo, scaffolding a new repo's lint/hook setup, or deciding where a hook or shared lint config should live. Covers the canonical nix-devenv/dryvist-.github architecture, profiles, and consumer patterns.
3SKILL.mdUpdated Jun 11, 2026
jacobpevans/refresh-repo
testing
VerifiedTrustedCommunity
Check PR merge readiness, sync local repo, cleanup stale worktrees; optional cross-repo sweep and stale-branch prune modes
3SKILL.mdUpdated Apr 28, 2026