---
name: git-github-tools
description: Use when resolving merge conflicts ('resolving-merge-conflicts'), triaging issues/PRs ('issue-pr-triage' AGENT-BRIEF.md), managing worktrees, GitHub ops, or fixing PR comments.
author: J StaR Films / Matt Pocock
coauthored: J StaR Films / Takomi
version: 2.0.0
---

# Git & GitHub Tools Suite

Operations for git workflow management, merge conflict reconciliation, issue/PR triage state machines, and isolated worktrees.

## Sub-Skills

| Sub-Skill | Purpose | Path |
|---|---|---|
| **`resolving-merge-conflicts`** | 3-step intent reconciliation for in-progress git merge/rebase conflicts | [`resolving-merge-conflicts/SKILL.md`](resolving-merge-conflicts/SKILL.md) |
| **`issue-pr-triage`** | State machine for issues and external PRs; writes durable `AGENT-BRIEF.md` contracts | [`issue-pr-triage/SKILL.md`](issue-pr-triage/SKILL.md) |
| **`git-worktree`** | Creating and managing isolated git worktrees for parallel agent development | [`git-worktree/SKILL.md`](git-worktree/SKILL.md) |
| **`github-ops`** | Managing GitHub issues, PRs, milestones, and labels | [`github-ops/SKILL.md`](github-ops/SKILL.md) |
| **`pr-comment-fix`** | Automated resolution of PR review feedback and comments | [`pr-comment-fix/SKILL.md`](pr-comment-fix/SKILL.md) |