resolving-merge-conflicts
by community
Use this page as a decision snapshot for resolving-merge-conflicts: trust signal, install momentum, real user feedback, and high-intent related pages you can compare next.
Description
1. **查看当前 merge/rebase 状态**。检查 git history 和冲突文件。 2. **为每个冲突找到 primary sources**。深入理解每个变更为什么产生，以及原始意图是什么。阅读 commit messages，检查 PRs，检查原始 issues/tickets。 3. **解决每个 hunk。** 尽可能保留双方意图。若二者不兼容，选择符合本次 merge 目标的一方，并记录 trade-off。**不要**发明新行为。始终解决冲突；不要 `--abort`。 4. 发现项目的 **automated checks** 并运行它们，通常是 typecheck、tests、format。修复 merge 引入的问题。 5. **完成 merge/rebase。** Stage 所有内容并 commit。若正在 rebase，继续 rebase 流程直到所有 commits 都完成。
Install resolving-merge-conflicts
Run this in your OpenClaw agent to add resolving-merge-conflicts from the ClawHub registry.
openclaw skills install resolving-merge-conflictsRequires ClawHub registry access. Review the security analysis below before installing.
Security Analysis
Open Source
Code is publicly available for audit.
Community Verified
Reviewed by the ClawHub community.
Community Reviews
Real user ratings only — separate from the editorial assessment and ClawHub signal.
Installed this skill? Sign in and leave the first review.
Save the skill now, come back after testing it, and help the next person choose with a quick review.
Related skills
Frequently asked questions
Is resolving-merge-conflicts safe to install?
resolving-merge-conflicts has a SkillsReview security score of 50/100. It is open source and community-verified on ClawHub. Check the full Security Analysis on this page before installing.
How much does resolving-merge-conflicts cost?
resolving-merge-conflicts is free to install for OpenClaw via ClawHub.
What are the best alternatives to resolving-merge-conflicts?
You can compare resolving-merge-conflicts side by side with similar OpenClaw skills on the SkillsReview comparison page to find the best fit for your workflow.
How do I install resolving-merge-conflicts?
Install resolving-merge-conflicts from ClawHub at clawhub.ai/skills/resolving-merge-conflicts, or use the install action on this page to copy the command for your OpenClaw agent.
Community Signal
Historical movement
Timeline plus trend snapshots for security, reviews, and reputation tilt.
Trend Charts
30 / 90 / 180 day snapshots for ranking movement and security-score movement.
Last updated unknown UTC
Submit your review
Share your experience and help others find the best skills.
Newsletter
Stay updated on resolving-merge-conflicts and the wider SkillsReview ecosystem
Get the weekly Top 5, fresh security alerts, and newly hot skills by email. You can unsubscribe from any newsletter email in one click.