Help resolve common Git problems and conflicts with step-by-step commands and explanations for each situation.
Steps
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
Branch Management
Help with branch cleanup and organization
Suggest rebasing vs merging strategies
Assist with cherry-picking specific commits
Guide through complex branch operations
Commit History
Help with commit message improvements
Assist with squashing and organizing commits
Guide through interactive rebase operations
Fix commit authorship and metadata
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
Converted and distributed by TomeVault — claim your Tome and manage your conversions.
1---2name: gologo13-agent-skills-fix-git-issues3description: Fix Git Issues4---56# Fix Git Issues78## Overview910Help resolve common Git problems and conflicts with step-by-step commands and explanations for each situation.1112## Steps13141. **Merge Conflicts**15 - Analyze conflicting changes and their context16 - Provide resolution strategies for different conflict types17 - Suggest the best approach to preserve important changes18 - Generate resolved code maintaining functionality192. **Branch Management**20 - Help with branch cleanup and organization21 - Suggest rebasing vs merging strategies22 - Assist with cherry-picking specific commits23 - Guide through complex branch operations243. **Commit History**25 - Help with commit message improvements26 - Assist with squashing and organizing commits27 - Guide through interactive rebase operations28 - Fix commit authorship and metadata294. **Repository Issues**30 - Help recover from detached HEAD state31 - Assist with undoing commits and changes32 - Guide through stash management33 - Resolve submodule and remote issues3435## Git Issues Checklist3637- [ ] Problem identified and analyzed38- [ ] Git commands provided with explanations39- [ ] Resolution strategy validated40- [ ] Changes tested and verified41- [ ] Repository state clean and functional4243---44> Converted and distributed by [TomeVault](https://tomevault.io/claim/gologo13) — claim your Tome and manage your conversions.45<!-- tomevault:4.0:skill_md:2026-04-14 -->
Run npx skillmds@latest add tomevault-io/gologo13-agent-skills-fix-git-issues in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.
Fix Git Issues It is listed under AI & ML on SkillMD.
This skill has not completed SkillMD's automated safety review yet. Independent scanners report: SkillSpector: PASS, Skill Scanner: PASS. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.
This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.
Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.
tomevault-io (@tomevault-io) published this skill. Their other Agent Skills are listed on their SkillMD profile.
tomevault-io