claudeindex
Plugin

dex-skill-merge-conflict-resolution

Разрешение конфликтов merge/rebase без тихой потери стороны: семантические конфликты, ours/theirs в rebase, modify/delete как переезд, lock-файлы, миграции, evil merge.

Installation

1

Add the marketplace

/plugin marketplace add dex-it/claude-code-marketplace
2

Install plugins

/plugin

Run these commands in Claude Code to add this plugin to your environment. The marketplace must be added before you can install its plugins.