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 capability: resolve merge conflicts

Browse skills that share this capability.

  • git - Advanced Git Workflows
    gitversion controlcode managementrepository

    ★ 11 · Updated 2026-06-30

    Perform advanced Git operations including rebase, cherry-pick, bisect, worktrees, and reflog

    ⚙ clean commit history⚙ apply commits⚙ find bug commits
  • pull - Pull latest commits from origin
    gitpullsyncsubmodule

    ★ 32 · Updated 2026-06-15

    Pull latest commits from origin, commit local changes first, merge conflicts, and run setup scripts

    ⚙ commit local changes⚙ fetch from origin⚙ pull latest commits
  • merge-upstream - Sync Azure Codex with upstream OpenAI
    gitazureforkcode

    ★ 18 · Updated 2026-06-15

    Sync Azure Codex fork with upstream while preserving Azure features

    ⚙ fetch upstream updates⚙ check git divergence⚙ create backup branch
  • git-advanced-workflows - Advanced Git Workflows for Clean History
    gitversion controlbranch managementhistory management

    ★ 18 · Updated 2026-05-28

    Manage complex Git histories with advanced techniques like rebase, cherry-pick, bisect, worktrees, and reflog

    ⚙ rebase commits interactively⚙ cherry-pick specific commits⚙ bisect commit history
  • merging-worktrees - Merge Parallel Worktrees to Unified Branch
    gitmergeworktreeparallel development

    ★ 4 · Updated 2026-05-09

    Merges parallel worktrees with conflict detection, 3-way analysis, and ordered resolution

    ⚙ build dependency graph⚙ create merge plan⚙ execute sequential merges
  • create-backport-branch - Cherry-pick GitHub PR commits to release branch
    gitbackportcherry-pickGitHub

    ★ 0 · Updated 2026-05-09

    Create a new backport branch by cherry-picking all commits from a GitHub PR onto a target release branch or commit

    ⚙ create backport branch⚙ cherry-pick commits⚙ resolve merge conflicts
  • git-workflow - Git workflow design and configuration
    gitworkflowCI/CDbranching

    ★ 57 · Updated 2026-03-26

    Designs git workflows including branching strategies, CI/CD pipelines, and repository hygiene

    ⚙ design branching strategies⚙ write commit messages⚙ configure GitHub Actions
  • dev-swarm-git-merge - Git Partial and Clean Merge Skill
    gitmergeversion controldevops

    ★ 18 · Updated 2026-03-22

    Execute git partial merges of specific folders and squash merges for clean single-commit branch integration

    ⚙ checkout specific folders from branch⚙ perform squash merge⚙ switch target branch
  • update - Git Branch Update and Conflict Resolution
    gitversion controlmergeconflict resolution

    ★ 2 · Updated 2026-03-22

    Fetch upstream changes, merge branch, and resolve conflicts

    ⚙ detect tracking branch⚙ fetch upstream changes⚙ check update status
  • git-flow - Git Workflow Branching Strategies Guide
    gitversion controlbranchmerge

    ★ 75 · Updated 2026-03-20

    Guide Git branching strategies, naming conventions, and merge operations

    ⚙ check unmerged branches⚙ synchronize latest code⚙ create feature branch
  • merge - Branch Management: Commit, Rebase and Merge
    version-controlgitbranchingmerging

    ★ 602 · Updated 2026-02-12

    Commit staged changes, rebase onto base branch, and merge the current branch

    ⚙ commit staged changes⚙ rebase onto base branch⚙ run workmux merge command
  • git-workflow - Git Workflow Operations and Pull Request Management
    gitversion-controlpull-requestscollaboration

    ★ 9 · Updated 2026-02-11

    Performs Git operations including commits, rebasing, conflict resolution, and pull request creation.

    ⚙ create pull requests⚙ rebase branches⚙ resolve merge conflicts