Remote OpenClaw
Menu
SkillsMCPPluginsGuideDigestSubmit MCPSkillPluginMCPMCP, plugin, or skillAdvertise
Remote OpenClaw
SkillsMCPPluginsGuideDigestSubmit MCPSkillPluginMCPMCP, plugin, or skillAdvertise

Featured

Reach 49,000+ AI builders from just $0.50 a click

You only pay for clicks, never impressions - and it's far cheaper than Google Ads, with no monthly lock-in.

Advertise from $0.50/click →
SetupClaw: done-for-you OpenClaw for founders & exec teams logoSetupClaw: done-for-you OpenClaw for founders & exec teams

White-glove OpenClaw for founders and exec teams (4–50+ employees): we install, harden, integrate your tools, and maintain it — secured from day one.

Get it set up for you →
One API to scrape, enrich, and extract the internet. logoOne API to scrape, enrich, and extract the internet.

Context.dev gives your agents a single API to scrape, enrich, and extract live web data — no proxies, no parsers, no maintenance.

Start building free →
CLN.Work — Stop prompting, start hiring AI employees logoCLN.Work — Stop prompting, start hiring AI employees

Turn your Claude agents into a real team — onboard them, assign tasks, and manage them like staff.

Hire AI employees →
Launch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10 logoLaunch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click OpenClaw install on a VPS you control. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch OpenClaw →
Get a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10 logoGet a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click install of the self-improving Hermes agent on a VPS you control. Connect Telegram, Discord, Slack and more. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch Hermes →
Reach 49,000+ AI builders from just $0.50 a click

You only pay for clicks, never impressions - and it's far cheaper than Google Ads, with no monthly lock-in.

Advertise from $0.50/click →
SetupClaw: done-for-you OpenClaw for founders & exec teams logoSetupClaw: done-for-you OpenClaw for founders & exec teams

White-glove OpenClaw for founders and exec teams (4–50+ employees): we install, harden, integrate your tools, and maintain it — secured from day one.

Get it set up for you →
One API to scrape, enrich, and extract the internet. logoOne API to scrape, enrich, and extract the internet.

Context.dev gives your agents a single API to scrape, enrich, and extract live web data — no proxies, no parsers, no maintenance.

Start building free →
CLN.Work — Stop prompting, start hiring AI employees logoCLN.Work — Stop prompting, start hiring AI employees

Turn your Claude agents into a real team — onboard them, assign tasks, and manage them like staff.

Hire AI employees →
Launch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10 logoLaunch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click OpenClaw install on a VPS you control. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch OpenClaw →
Get a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10 logoGet a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click install of the self-improving Hermes agent on a VPS you control. Connect Telegram, Discord, Slack and more. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch Hermes →
Reach 49,000+ AI builders from just $0.50 a click

You only pay for clicks, never impressions - and it's far cheaper than Google Ads, with no monthly lock-in.

Advertise from $0.50/click →
SetupClaw: done-for-you OpenClaw for founders & exec teams logoSetupClaw: done-for-you OpenClaw for founders & exec teams

White-glove OpenClaw for founders and exec teams (4–50+ employees): we install, harden, integrate your tools, and maintain it — secured from day one.

Get it set up for you →
One API to scrape, enrich, and extract the internet. logoOne API to scrape, enrich, and extract the internet.

Context.dev gives your agents a single API to scrape, enrich, and extract live web data — no proxies, no parsers, no maintenance.

Start building free →
CLN.Work — Stop prompting, start hiring AI employees logoCLN.Work — Stop prompting, start hiring AI employees

Turn your Claude agents into a real team — onboard them, assign tasks, and manage them like staff.

Hire AI employees →
Launch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10 logoLaunch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click OpenClaw install on a VPS you control. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch OpenClaw →
Get a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10 logoGet a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click install of the self-improving Hermes agent on a VPS you control. Connect Telegram, Discord, Slack and more. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch Hermes →
Skills/vinvcn/mattpocock-skills-zh-cn/resolving-merge-conflicts
resolving-merge-conflicts logo

resolving-merge-conflicts

vinvcn/mattpocock-skills-zh-cn
743 installs2K stars
Run it on Hostinger →up to 70% off + an extra 10% with code ZACAARON10Free API →

Installation

npx skills add https://github.com/vinvcn/mattpocock-skills-zh-cn --skill resolving-merge-conflicts

Summary

适用于需要解决正在进行的 git merge/rebase 冲突时。

SKILL.md

  1. 查看当前 merge/rebase 状态。检查 git history 和冲突文件。
  1. 为每个冲突找到 primary sources。深入理解每个变更为什么产生，以及原始意图是什么。阅读 commit messages，检查 PRs，检查原始 issues/tickets。
  1. 解决每个 hunk。 尽可能保留双方意图。若二者不兼容，选择符合本次 merge 目标的一方，并记录 trade-off。不要发明新行为。始终解决冲突；不要 --abort。
  1. 发现项目的 automated checks 并运行它们，通常是 typecheck、tests、format。修复 merge 引入的问题。
  1. 完成 merge/rebase。 Stage 所有内容并 commit。若正在 rebase，继续 rebase 流程直到所有 commits 都完成。

Score

0–100
57/ 100

Grade

C

Popularity17/30

743 installs — growing adoption. Source repo has 1,974 GitHub stars.

Completeness19/30

Documented: full SKILL.md body, one-line install. Missing: description, category/license metadata.

Trust15/25

Community skill with a public GitHub source repository you can review.

Freshness6/15

No update timestamp is tracked for this skill in our catalog.

Scored automatically from popularity, completeness, trust, and freshness — computed only from data in our catalog, never fabricated.

Proud of your score? Add this badge to your README.

Paste a snippet into your GitHub README. The badge updates automatically and links back to this page.

Resolving Merge Conflicts skill score badge previewScore badge

Markdown

[![Resolving Merge Conflicts skill](https://www.remoteopenclaw.com/skills/vinvcn/mattpocock-skills-zh-cn/resolving-merge-conflicts/badges/score.svg)](https://www.remoteopenclaw.com/skills/vinvcn/mattpocock-skills-zh-cn/resolving-merge-conflicts)

HTML

<a href="https://www.remoteopenclaw.com/skills/vinvcn/mattpocock-skills-zh-cn/resolving-merge-conflicts"><img src="https://www.remoteopenclaw.com/skills/vinvcn/mattpocock-skills-zh-cn/resolving-merge-conflicts/badges/score.svg" alt="Resolving Merge Conflicts skill"/></a>

Resolving Merge Conflicts FAQ

How do I install the Resolving Merge Conflicts skill?

Run “npx skills add https://github.com/vinvcn/mattpocock-skills-zh-cn --skill resolving-merge-conflicts” in your terminal. The skill is added to your agent's skills directory and picked up automatically on the next run — no restart or extra configuration needed.

What does the Resolving Merge Conflicts skill do?

适用于需要解决正在进行的 git merge/rebase 冲突时。 The full SKILL.md on this page shows the exact instructions the skill gives your agent.

Is the Resolving Merge Conflicts skill free?

Yes. Resolving Merge Conflicts is a free, open-source skill published from vinvcn/mattpocock-skills-zh-cn. As with any third-party skill, review the source repository before installing it into an agent with sensitive access.

Does Resolving Merge Conflicts work with Claude Code and OpenClaw?

Yes. Skills use the portable SKILL.md format, so Resolving Merge Conflicts works with Claude Code, OpenClaw, Codex, Hermes, and any other agent that reads SKILL.md skills.

Featured

Reach 49,000+ AI builders from just $0.50 a click

You only pay for clicks, never impressions - and it's far cheaper than Google Ads, with no monthly lock-in.

Advertise from $0.50/click →
SetupClaw: done-for-you OpenClaw for founders & exec teams logoSetupClaw: done-for-you OpenClaw for founders & exec teams

White-glove OpenClaw for founders and exec teams (4–50+ employees): we install, harden, integrate your tools, and maintain it — secured from day one.

Get it set up for you →
One API to scrape, enrich, and extract the internet. logoOne API to scrape, enrich, and extract the internet.

Context.dev gives your agents a single API to scrape, enrich, and extract live web data — no proxies, no parsers, no maintenance.

Start building free →
CLN.Work — Stop prompting, start hiring AI employees logoCLN.Work — Stop prompting, start hiring AI employees

Turn your Claude agents into a real team — onboard them, assign tasks, and manage them like staff.

Hire AI employees →
Launch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10 logoLaunch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click OpenClaw install on a VPS you control. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch OpenClaw →
Get a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10 logoGet a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click install of the self-improving Hermes agent on a VPS you control. Connect Telegram, Discord, Slack and more. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch Hermes →
Reach 49,000+ AI builders from just $0.50 a click

You only pay for clicks, never impressions - and it's far cheaper than Google Ads, with no monthly lock-in.

Advertise from $0.50/click →
SetupClaw: done-for-you OpenClaw for founders & exec teams logoSetupClaw: done-for-you OpenClaw for founders & exec teams

White-glove OpenClaw for founders and exec teams (4–50+ employees): we install, harden, integrate your tools, and maintain it — secured from day one.

Get it set up for you →
One API to scrape, enrich, and extract the internet. logoOne API to scrape, enrich, and extract the internet.

Context.dev gives your agents a single API to scrape, enrich, and extract live web data — no proxies, no parsers, no maintenance.

Start building free →
CLN.Work — Stop prompting, start hiring AI employees logoCLN.Work — Stop prompting, start hiring AI employees

Turn your Claude agents into a real team — onboard them, assign tasks, and manage them like staff.

Hire AI employees →
Launch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10 logoLaunch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click OpenClaw install on a VPS you control. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch OpenClaw →
Get a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10 logoGet a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click install of the self-improving Hermes agent on a VPS you control. Connect Telegram, Discord, Slack and more. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch Hermes →
Reach 49,000+ AI builders from just $0.50 a click

You only pay for clicks, never impressions - and it's far cheaper than Google Ads, with no monthly lock-in.

Advertise from $0.50/click →
SetupClaw: done-for-you OpenClaw for founders & exec teams logoSetupClaw: done-for-you OpenClaw for founders & exec teams

White-glove OpenClaw for founders and exec teams (4–50+ employees): we install, harden, integrate your tools, and maintain it — secured from day one.

Get it set up for you →
One API to scrape, enrich, and extract the internet. logoOne API to scrape, enrich, and extract the internet.

Context.dev gives your agents a single API to scrape, enrich, and extract live web data — no proxies, no parsers, no maintenance.

Start building free →
CLN.Work — Stop prompting, start hiring AI employees logoCLN.Work — Stop prompting, start hiring AI employees

Turn your Claude agents into a real team — onboard them, assign tasks, and manage them like staff.

Hire AI employees →
Launch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10 logoLaunch your always-on OpenClaw agent on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click OpenClaw install on a VPS you control. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch OpenClaw →
Get a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10 logoGet a Hermes agent running 24/7 on Hostinger — up to 70% off + 10% with code ZACAARON10

One-click install of the self-improving Hermes agent on a VPS you control. Connect Telegram, Discord, Slack and more. Sale live now: up to 70% off, plus an extra 10% with code ZACAARON10.

Launch Hermes →

Categories

No CodePrompt Injection
View on GitHub

Recommended skills

Browse all →
resolving-merge-conflicts logo

resolving-merge-conflicts

mattpocock/skills

101K installsInstall
find-skills logo

find-skills

vercel-labs/skills

2.5M installsInstall
frontend-design logo

frontend-design

anthropics/skills

670K installsInstall
grill-me logo

grill-me

mattpocock/skills

567K installsInstall
vercel-react-best-practices logo

vercel-react-best-practices

vercel-labs/agent-skills

555K installsInstall
agent-browser logo

agent-browser

vercel-labs/agent-browser

549K installsInstall

Browse

Skills by category

Frontend250Git198Data154Testing120Design105Docs103Security96Automation87Backend76Devops37Productivity29Mcp23

Related guides

Hand-picked reading to help you choose, install, and use agent skills.

GuideBest Openclaw Skills 2026GuideHow To Evaluate Openclaw Skill Before InstallingGuideOpenclaw Skills Complete Guide

Remote OpenClaw

AI agent skills directory, marketplace, and workflow hub for OpenClaw, Hermes Agent, Claude Code, Codex, and MCP-powered operator stacks.

The Agent Stack: weekly agent tooling digest, free.

Explore

  • Home
  • Skills Directory
  • Claude Code Skills
  • Codex Skills
  • MCP Clients
  • Marketplace
  • Hermes Ecosystem
  • Guide
  • Learn
  • Blog
  • The Agent Stack (Digest)

More

  • Submit a Tool
  • Advertise
  • Playbook
  • Free Tools
  • API
  • Shipping
  • Contact
  • Terms
  • Privacy

Know a company that should advertise here? Refer them and earn 10% — up to $300 per referral.

© 2026 Remote OpenClaw
Fazier badgeFeatured on Twelve ToolsFeatured on Wired BusinessRemote OpenClaw - Featured on AI Agents DirectoryListed on Turbo0