fix-git-issues

fix-git-issues is a skill for Claude Code, Cursor from emaraschio/cursor-commands. It costs 13 tokens per session (336 once invoked), scanned A, original, MIT.

A guide for diagnosing and fixing problems in Git, the version-control system used to track code changes. It covers conflicts, branches, commit history, detached HEAD states, stashes, submodules, and remotes.

In plain words
What is it for?
Use it to resolve merge conflicts, manage branches, improve or reorganize commits, recover repository state, and handle stash or remote issues.
Why use it?
It helps recover from repository mistakes and choose a safe way to preserve and organize changes.

Skill for Claude CodeCursor

Written for Claude Code and Cursor: user-invocable in frontmatter, but also shipped in a Cursor plugin.

Part of the cursor-commands plugin — 44 skills, 43 commands shipped together

Good fit Use it to resolve merge conflicts, manage branches, improve or reorganize commits, recover repository state, and handle stash or remote issues.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/emaraschio/cursor-commands/fix-git-issues
Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Any agent
npx skills add emaraschio/cursor-commands --skill fix-git-issues
Clone the repo
git clone --depth 1 https://github.com/emaraschio/cursor-commands

Made for: Claude Code, Cursor.

Or install cursor-commands, the plugin that ships this one along with the rest of its 44 skills, 43 commands.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for fix-git-issues

README.md
[![agentmods](https://agentmods.dev/badge/skills/emaraschio/cursor-commands/fix-git-issues/github.svg)](https://agentmods.dev/skills/emaraschio/cursor-commands/fix-git-issues)
Your own site
<a href="https://agentmods.dev/skills/emaraschio/cursor-commands/fix-git-issues"><img src="https://agentmods.dev/badge/skills/emaraschio/cursor-commands/fix-git-issues/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for fix-git-issues

Your own site · 80×15
<a href="https://agentmods.dev/skills/emaraschio/cursor-commands/fix-git-issues"><img src="https://agentmods.dev/badge/skills/emaraschio/cursor-commands/fix-git-issues.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 13 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 336 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00013 $0.00336
Opus 5.5 $0.00005 $0.00134
Sonnet 5.5 $0.00003 $0.00067
Haiku 4.5 $0.00001 $0.00034

Measured 1mo ago against content hash 0b75ade219a4, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

fix-git-issues scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 1mo ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.cursor/skill-contracts/fix-git-issues/SKILL.md · 46 lines

What it actually says

Overview

Help resolve common Git problems and conflicts with step-by-step commands and explanations for each situation.

Steps

  1. Merge Conflicts
    • Analyze conflicting changes and their context
    • Provide resolution strategies for different conflict types
    • Suggest the best approach to preserve important changes
    • Generate resolved code maintaining functionality
  2. Branch Management
    • Help with branch cleanup and organization
    • Suggest rebasing vs merging strategies
    • Assist with cherry-picking specific commits
    • Guide through complex branch operations
  3. Commit History
    • Help with commit message improvements
    • Assist with squashing and organizing commits
    • Guide through interactive rebase operations
    • Fix commit authorship and metadata
  4. Repository Issues
    • Help recover from detached HEAD state
    • Assist with undoing commits and changes
    • Guide through stash management
    • Resolve submodule and remote issues

Git Issues Checklist

  • Problem identified and analyzed
  • Git commands provided with explanations
  • Resolution strategy validated
  • Changes tested and verified
  • Repository state clean and functional

Guardrails

  • Get explicit consent before destructive git commands (reset, rebase, or history rewrite).
  • Never force-push main or a shared branch without an explicit request.
  • Explain each command before running it.
  • Never print or commit secrets or credential files (.env, .env.*, keys); flag any exposure instead of committing it.
Files

What ships with it

3 files beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 1mo ago First seen · 46 lines · 13 tokens per session scan A 0b75ade219a4

Subscribe to this mod's changes

fix-git-issues is a skill published in the GitHub repository emaraschio/cursor-commands (9 stars, last pushed 5d ago), licensed MIT. It adds 13 tokens to every session and 336 once invoked, about $0.0001 per session on Opus 5.5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-09-03.

Related

Other skills, from other repositories

housekeep-dead-code

Remove dead code by category — one commit each, typecheck and tests between, bisect on red — then add a Knip ratchet. Use when "delete the dead code", "remove unused files", or "wire up Knip". Audit first → plan-dead-code. README/deps → workflow-housekeep.

kensaurus/cursor-kenji · 71 tokens

git-onboarding-auto

A Git setup and pull-request workflow automation skill. Git is the version-control tool developers use to track code changes, while a pull request is a request for teammates to review and merge those changes.

GeonheeYe/multi-agent-dotfiles · 47 tokens

commit

Generate a conventional commit message for staged changes.

jaansokk/cursor_tools · 10 tokens

git-workflow-and-versioning

Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, splitting uncommitted work in a messy working tree into clean atomic commits, opening or reviewing a pull request (PR), pushing to a remote, or when you need to organize work across multiple…

addyosmani/agent-skills · 89 tokens

git-advanced-workflows

Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.

wshobson/agents · 54 tokens

chinese-commit-conventions

A Chinese-language guide to Conventional Commits, a format for writing consistent Git commit messages, plus related changelog, commit-checking, and commit-helper configuration.

jnMetaCode/superpowers-zh · 65 tokens