kapicic/git-merge-conflict-skill

Agent skill for resolving conflicts

¿Qué es git-merge-conflict-skill?

git-merge-conflict-skill is a Claude Code agent skill that agent skill for resolving conflicts.

Compatible con~Claude Code~Codex CLI~Cursor

npx skills add kapicic/git-merge-conflict-skill

Installed? Explore more Programación y desarrollo skills: steipete/bluebubbles, steipete/eightctl, steipete/blucli · View all 6 →

Abre un nuevo chat con esta habilidad de agente ya precargada.

Agent skill for resolving conflicts

Send and manage iMessages via BlueBubbles, including attachments, tapbacks, edits, replies, and groups.

Control Eight Sleep pods (status, temperature, alarms, schedules).

BluOS CLI (blu) for discovery, playback, grouping, and volume.

Create, search, and manage Bear notes via grizzly CLI.

Capture frames or clips from RTSP/ONVIF cameras.

Search GIF providers with CLI/TUI, download results, and extract stills/sheets.