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

dsh-merge-conflicts

Automated evidence available

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

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

Canonical semantic path

Development & CodeGit & Version Control WorkspaceGit Conflict Resolution

One primary path; alternate capabilities remain separate.
automation.validationgit.mergegit.rebase

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-19

What can currently be confirmed

Active analysis coverage 5/5. Historical chains are retained but do not count toward current coverage.

Analysis complete

Source structure

Conclusion: The source structure check completed without finding a structural issue.

Analysis complete

Repository health

Conclusion: The GitHub repository could not be confirmed as reachable.

Analysis complete

npm release

Conclusion: Resolved npm release 0.1.0, published 2026-08-19, license MIT.

Analysis complete

DSH compatibility

Conclusion: Compatibility verification passed. Installation, profile loading, and sustained startup all completed. Test environment: DSH 0.1.6-alpha.2, web profile.

Analysis complete

Dependency audit

Conclusion: This bounded audit reported 0 known vulnerabilities. It covers only the locked versions and audit source; zero reports is not proof of safety.

Not analyzed

Functional verification

The plugin’s advertised feature has not been automatically verified. Passing installation and startup does not prove that feature works.

Analysis complete

Static risk scan

Conclusion: The bounded static scan found none of its predefined risk signals. This is not proof of safety.

Analysis complete

Package integrity

Conclusion: Package name, version, entrypoints, and checksum passed validation. Artifact: dsh-merge-conflicts@0.1.0; SHA-256: 0ea7ad406557584ddaf090cc0b7a3dc157b81082317d8635302195a7f897ce49.

Automated evidence is scoped to the named artifact, DSH target and profile. It is not a blanket safety or feature-completeness claim.

Continue with the latest plugin manager

Describe your task in a DSH conversation and mention dsh-merge-conflicts. After installing or updating the manager from npm latest, it can find this candidate through Registry, then inspect its actual source and version locally.

Install or update the plugin manager (latest)