kapicic/git-merge-conflict-skill

Agent skill for resolving conflicts

What is git-merge-conflict-skill?

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

Works with~Claude Code~Codex CLI~Cursor

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

Open a new chat with this agent skill pre-loaded.

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.