# Git Conflicts

> Resolve git merge or rebase conflicts and continue the operation.

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

---


# Git Conflicts

Use the `code:cli` skill.

Run `git status` to understand the merge or rebase state and identify conflicted files.

For each conflicted file:

- Read the file and inspect conflict markers.
- Understand the HEAD side and incoming side.
- Resolve by choosing the correct version or combining changes.
- Remove all conflict markers.

After resolving all conflicts:

```bash
git add <resolved-files>
git rebase --continue
```

If more conflicts appear, repeat the process. Verify completion with `git status` and recent commit history.