git-workflow

Enforce branching strategies, conventional commits, and PR guidance via Git and GitHub CLI.

Updated Apr 21, 2026
One-click install
npx skills add https://github.com/nielpattin/.pi-tnega --skill git-workflow-nielpattin
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/nielpattin/.pi-tnega/tree/main/skills/git-workflow
Command: npx skills add https://github.com/nielpattin/.pi-tnega --skill git-workflow-nielpattin

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git workflow assistant helps teams optimize branching, commits, PRs, and conflict resolution, reducing cognitive load and miscommunication in software delivery.

Core Features & Use Cases

  • Branch Strategy: Propose and enforce a project-appropriate branching model (Solo, Team, Release) and adapt to worktree scenarios.
  • Worktree-aware workflow: Detects when using git worktrees and guides operations based on the canonical repo root and ownership metadata.
  • Commit Messages: Enforces Conventional Commits to standardize messages across the repository.
  • PR Workflow: Assists with PR title/description generation and reviewer assignment, and provides PR URLs for quick navigation.
  • Non-interactive safety: Respects non-interactive modes for git/gh commands to avoid prompts and editors.
  • Conflict Resolution: Guides resolving file conflicts with minimal changes and preserves intent from both sides.
  • Interactive Rebase: Guides and aids in cleaning up history before PR.

Quick Start

Ask the AI to propose a branching strategy and a corresponding PR workflow for your project.

Frequently Asked Questions about git-workflow

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I standardize Git branching and pull request workflows for my team?

To standardize Git workflows, you can enforce a project-appropriate branching model like Solo, Team, or Release, and guide pull request processes to improve consistency across your repository. This reduces miscommunication by adapting branching strategies to your specific collaborative or solo context.

What is the best way to enforce conventional commits in a repository?

The best way to enforce conventional commits is to apply automated guidance that standardizes commit messages across the repository. This ensures consistent formatting for all commits, reducing cognitive load and making project history easier to parse for collaborative teams.

How do I resolve Git file conflicts while preserving intent from both branches?

To resolve Git file conflicts while preserving intent, use guided conflict resolution that applies minimal changes and maintains the original logic from both sides. This approach ensures that merging divergent branches does not overwrite critical context or introduce unintended modifications.

Can I manage Git worktrees without breaking the canonical repository root?

Yes, you can manage Git worktrees safely by detecting worktree scenarios and guiding operations based on the canonical repository root and ownership metadata. This worktree-aware workflow prevents accidental corruption and ensures operations execute in the correct directory context.

How do I clean up Git history with an interactive rebase before a pull request?

To clean up Git history before a pull request, use guided interactive rebase to squash or reorder commits. This process streamlines your commit history, making pull request reviews easier and maintaining a clear, logical progression of changes in your repository.

Does non-interactive Git command handling prevent prompts during automated pull request generation?

Yes, non-interactive Git command handling prevents prompts by respecting non-interactive modes for Git and GitHub CLI commands. This avoids triggering text editors or manual confirmation prompts, allowing automated pull request title and description generation to execute seamlessly.