DSH Plugin Registry
中文EN
Submit plugin
Plugins/dsh-merge-conflicts

dsh-merge-conflicts

Source candidate

解决 git 合并/变基冲突：看清现状→找到各方意图→逐块解决→跑自动化检查→完成合并。受 mattpocock/skills（223k★ MIT）启发。

Author: satan9394 · Git & Code Review · Catalog snapshot: 2026-09-05

What it may solve

解决 git 合并/变基冲突：看清现状→找到各方意图→逐块解决→跑自动化检查→完成合并。受 mattpocock/skills（223k★ MIT）启发。

Imported third-party catalog description; not a Registry verification conclusion.

Sources and public signals

satan9394/dsh-merge-conflicts

— stars · 191 downloads

Signals were provided by the source catalog and do not imply quality or safety. 2026-09-05

What can currently be confirmed

Not tested

DSH compatibility

No exact-version test is available.

Not tested

Security analysis

No Registry security conclusion is available.

Not tested

Functional verification

No functional smoke evidence is available.

Not tested

Permissions

Plugin permissions have not been resolved.

Not tested

Exact artifact

Version and integrity have not been resolved.

Continue checking with the plugin manager

Describe your task in a DSH conversation and mention dsh-merge-conflicts. The plugin manager can find this candidate through Registry, then inspect its actual source and version locally.

Get the plugin manager command