fix-git-issues

SkillDev tools

Help resolve common Git problems and conflicts with step-by-step commands and explanations. Use when the user types /fix-git-issues.

Available today. Use it from your connected AI after setup.

Connect ahel once, and every AI you use reads what you have installed.

Then ask your AI: use the fix-git-issues skill

What this skill tells your AI

The instructions your AI receives, as published by blockmatic/basilic in .agents/skills/workflow/fix-git-issues/SKILL.md and read by ahel’s review.

Help resolve common Git problems and conflicts with step-by-step commands and explanations. Use global git user for any commits—never cursor/system identity. Never use --trailer for Co-authored-by or similar.

  1. Merge Conflicts: Analyze conflicting changes/context, provide resolution strategies, suggest best approach to preserve important changes, generate resolved code maintaining functionality
  2. Branch Management: Help with branch cleanup/organization, suggest rebasing vs merging strategies, assist with cherry-picking, guide through complex branch operations
  3. Commit History: Help with commit message improvements, assist with squashing/organizing commits, guide through interactive rebase, fix commit authorship/metadata
  4. Repository Issues: Help recover from detached HEAD state, assist with undoing commits/changes, guide through stash management, resolve submodule/remote issues

Signals

GitHub stars
89
Forks
11
Last commit
Sep 2026
Advanced
Catalog kind
skill
Gateway key
fix-git-issues
Source
github.com/blockmatic/basilic