fix-merge-conflicts
by community
Use this page as a decision snapshot for fix-merge-conflicts: trust signal, install momentum, real user feedback, and high-intent related pages you can compare next.
Description
# Fix merge conflicts ## Trigger Branch has unresolved merge conflicts and needs a reliable path to a buildable state. ## Workflow 1. Detect all conflicting files from git status and conflict markers. 2. Resolve each conflict with minimal, correctness-first edits. 3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable. 4. Regenerate lockfiles with package manager tools instead of hand-editing. 5. Run compile, lint, and relevant tests. 6. Stage
Install fix-merge-conflicts
Run this in your OpenClaw agent to add fix-merge-conflicts from the ClawHub registry.
openclaw skills install fix-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.
Frequently asked questions
Is fix-merge-conflicts safe to install?
fix-merge-conflicts has a SkillsReview security score of 85/100. It is open source and community-verified on ClawHub. Check the full Security Analysis on this page before installing.
How much does fix-merge-conflicts cost?
fix-merge-conflicts is free to install for OpenClaw via ClawHub.
What are the best alternatives to fix-merge-conflicts?
You can compare fix-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 fix-merge-conflicts?
Install fix-merge-conflicts from ClawHub at clawhub.ai/skills/fix-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 fix-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.