kapicic/git-merge-conflict-skill

Agent skill for resolving conflicts

O que é git-merge-conflict-skill?

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

Funciona com~Claude Code~Codex CLI~Cursor

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

Installed? Explore more Programação e Desenvolvimento skills: steipete/bluebubbles, steipete/eightctl, steipete/blucli · View all 6 →

Abre um novo chat com esta habilidade de agente já pré-carregada.

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.