Manifest
    by Manifold
    Back to Results
    Clean

    resolving-merge-conflicts

    Use when you need to resolve an in-progress git merge/rebase conflict.

    engineering›software-development
    Manifest86
    Lineage86
    Safety100
    Rank#1947
    mattpocockskills.shWorkflow217,128Last updated Aug 3, 2026, 08:26 PMskills.sh/mattpocock/skills/resolving-merge-conflicts

    Security Findings

    Flagged by the hosting marketplace

    the skills.sh security audit flagged this skill (status=warn, risk=medium) — flagged by Snyk

    Package registry name mismatch

    npm name 'mattpocock-skills' != repo 'skills'

    Versions

    1
    • Scanned Jul 9, 2026, 08:14 AM86
      Clean