SEMANTIC DIRECTORY · plugin-directory-semantic-v3-18

Git Conflict Resolution

专门识别、分析、展示和解决 Git 合并或变基冲突，包括冲突分块处理、解决Status跟踪和继续或中止冲突流程。不含一般分支管理或完整可视化工作台。

Use keyword search

Source catalog discovery.composite.2026-09-06.v1-0-5.b92b985e31dfCanonical structure · 823 nodes · 14829 plugins

Leaf membership

1 plugins

dsh-merge-conflictsdsh-merge-conflictsCatalog Analyzed解决 git 合并/变基冲突：看清现状→找到各方意图→逐块解决→跑自动化检查→完成合并。受 mattpocock/skills（223k★ MIT）启发。Git & Code ReviewnpmGitHubCompatibilityDSH 0.1.2-rc.1 · webDependency audit0 reported in bounded auditArtifact0.1.0Evidence updated2026-09-09Public signals191 downloads

Categories are public semantic index facts, not a final recommendation. Compatibility, permissions, and source evidence remain separate.