git-helper

Generate Conventional Commits messages and guide git workflows.

Updated Apr 12, 2026
One-click install
npx skills add https://github.com/softmg/product-tracker --skill git-helper-softmg
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-helper
Source: https://github.com/softmg/product-tracker/tree/main/.cursor/skills/git-helper
Command: npx skills add https://github.com/softmg/product-tracker --skill git-helper-softmg

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Many developers struggle to write clear, Conventional Commits messages and to safely perform everyday git workflows such as creating branches, updating from main, resolving conflicts, and investigating history; this Skill provides concise, actionable guidance and templates to reduce mistakes and maintain a clean repo history.

Core Features & Use Cases

  • Commit Message Generation: Analyze staged changes and produce Conventional Commits-formatted messages with suggested type and scope.
  • Branching & Syncing: Best-practice commands for creating feature branches, updating from main via merge or rebase, and cleaning up merged branches.
  • Conflict Resolution & Undo: Step-by-step conflict resolution, safe undo patterns (reset, revert), stash management, cherry-pick workflows, bisect usage, and tagging guidance.
  • Use Case: A developer with staged changes can get a concise commit message, instructions to rebase on origin/main, and safety checks to avoid rewriting shared history.

Quick Start

Ask the skill to generate a Conventional Commits message for your staged changes and recommend the appropriate branch command and safety steps.

Frequently Asked Questions about git-helper

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

FAQPage Schema
How do I generate a conventional commit message for staged changes?

To generate a conventional commit message, the skill analyzes your staged changes and produces a formatted message with a suggested type and scope. It ensures your commit history follows conventional commits standards automatically.

What is the best way to resolve git merge conflicts step by step?

The best way to resolve git merge conflicts is to follow step-by-step conflict resolution guidance provided by the skill, which walks you through identifying conflict markers, resolving discrepancies, and completing the merge safely.

Should I use git merge or rebase to update my feature branch from main?

Choosing between git merge and rebase depends on whether you need to preserve merge history or maintain a linear timeline; the skill provides best-practice commands and safety checks to help you avoid rewriting shared history during branch syncing.

How do I safely undo a git commit without rewriting shared history?

To safely undo a git commit without rewriting shared history, use non-destructive patterns like git revert instead of reset; the skill offers specific undo guidance to reverse changes while preserving remote branch integrity.

How do I use git bisect to find which commit introduced a bug?

Using git bisect involves binary searching through your commit history to isolate the offending commit; the skill provides actionable bisect workflows to help you systematically narrow down and identify the exact change that introduced a regression.

How do I cherry-pick a commit from one branch to another safely?

Cherry-picking a commit safely involves applying a specific commit's changes to another branch while managing potential conflicts; the skill outlines cherry-pick workflows and safety steps to ensure clean application across branches.