agentleFS
Sign inStart free
emaraschioemaraschio/cursor-commands/.cursor/skill-contracts/fix-git-issues/SKILL.md

fix-git-issues

Skill9 starsChanged 3 months agoMITView on GitHub

Diagnose and fix git state problems

  • Reads credentials

1 other project uses a version of this, 1 of them edited.

Adopted by

Most recently taken up by

The file

We split this skill into the rules it gives an agent

2 rules. About 0 are common, 2 are distinctive, and 0 are very specific to this project.

  • ≈0

    Common · estimate

    Many files like this have a rule of this kind.

  • ≈2

    Distinctive · estimate

    This author's own choices. Worth a look.

  • 0

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  • could be automatic: a setting could enforce it
  1. Distinctive:

    Never force-push main or a shared branch without an explicit request.

    line 44
  2. Distinctive:

    Never print or commit secrets or credential files (.env, .env.*, keys).

    line 46

≈ “Common” is an estimate: at least 1 in 5 of the 350,495 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

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.

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

Check your setup, free