# Git Advanced Common Issues

> Sub-skill of git-advanced: Common Issues.

- Skill: `vamseeachanta/git-advanced-common-issues` (Agent Skill)
- Install (CLI): `npx skillmds@latest add vamseeachanta/git-advanced-common-issues`
- Raw SKILL.md: https://api.skillmd.com/api/skills/vamseeachanta/git-advanced-common-issues/raw
- Safety review: PASS (external: skill-scanner PASS, skillspector CAUTION)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: vamseeachanta (https://skillmd.com/u/vamseeachanta)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/vamseeachanta/git-advanced-common-issues

---


# Common Issues

## Common Issues


**Accidental commit to wrong branch:**
```bash
# Move commit to new branch
git branch new-branch
git reset --hard HEAD~1
git checkout new-branch
```

**Undo merge:**
```bash
# If not pushed
git reset --hard HEAD~1

# If pushed
git revert -m 1 <merge-commit>
```

**Lost changes after checkout:**
```bash
# Check reflog
git reflog

# Recover from reflog
git checkout HEAD@{2}
```

**Resolve rebase conflicts:**
```bash
# During rebase conflict
git status
# Edit conflicted files
git add <resolved-files>
git rebase --continue

# Abort if needed
git rebase --abort
```

**Clean up after failed rebase:**
```bash
git rebase --abort
# Or
git reflog
git reset --hard HEAD@{n}
```