resolve-conflicts

Resolve git conflicts with AI-powered analysis, including mergiraf structural merging, lock file handling, and stacked PR duplicate detection.

Get it

$ npx degit haacked/dotfiles/ai/skills/resolve-conflicts .claude/skills/resolve-conflicts

From the most-starred rig that ships it: haacked/dotfiles. Same-named skills in different rigs may differ — review before use.

Often used together with

Rigs using resolve-conflicts (6)

haacked/dotfiles

My dotfiles and scripts I use on dev machines

★ 134 setup Claude CodeCodex 30 skills today

Skill Collector 4.1k tok ·

uhooi/dotfiles

My dotfiles

★ 43 setup Claude Code 8 skills 1d ago

Pragmatist 305 tok ·

domengabrovsek/agent-config

Shared agent configuration for Claude Code, Codex, and Pi. One AGENTS.md instruction source, 35 portable skills, 16 expert personas, and host adapters that wire each runtime to the same rules, hooks, and permission boundaries.

★ 17 setup Claude CodeCodex 4 mcp 36 skills 18 agents 21 hooks 7d ago

Fort Knox 25.5k tok ·

fmind/dot

AI-driven, CLI-first dotfiles for Linux & macOS — chezmoi + mise, Fish, Neovim, and a typed Python CLI

★ 9 setup Codex 92 skills 8d ago

Skill Collector 5.7k tok ·

navapbc/digital-service-orchestra

Workflow infrastructure plugin for Claude Code projects — TDD-driven sprint management, review gates, hook parameterization, and multi-stack config

★ 6 project Claude CodeCodexCopilot 39 skills 1d ago

Skill Collector 10.9k tok ·

richardsolomou/dotfiles

Personal macOS dotfiles: zsh, git, and Claude Code skills/agents

★ 0 setup Claude CodeCodex 18 skills today

Skill Collector 5.5k tok ·