LogoClawIndex
CasesSkillsAbout
LogoClawIndex

ClawIndex

OpenClaw Skills & Use Case Index

ClawIndex is an ecosystem-driven index of OpenClaw skills and real-world use cases.

Index

Skills·
Cases

Meta

About·
Disclaimer·
Email·
GitHub
© 2026 ClawIndex All Rights Reserved.

Skills with input: Conflicted files

Browse skills that use this input.

  • resolve-conflicts - Resolve Git merge conflicts with a plan
    Gitmerge conflictsconflict resolutionversion control

    ★ 18 · Updated 2026-10-03

    Assess Git merge conflicts, create an approval-based resolution plan, apply file-specific strategies, regenerate generated files, and run validation.

    ⚙ Assess conflicted files⚙ Categorize conflict types⚙ Create resolution plans