Run any Skill in Manus with one click

fix-merge-conflicts

Stars1

Forks1

UpdatedApril 8, 2026 at 11:23

Resolves merge conflicts conservatively and verifies the repo still builds. Use when the tree contains conflict markers or git reports unresolved merges.

Installation

Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.

Run Skill in Manus

Source

bitsocialnet

bitsocialnet/spam-blocker

View GitHub Repository View Creator Repositories

Download

Run Skill in Manus

Related occupationsSOC

Based on SOC occupation classification

Software DevelopersComputer and Mathematical Occupations·SOC 15-1252

SKILL.md

readonly

name	fix-merge-conflicts
description	Resolves merge conflicts conservatively and verifies the repo still builds. Use when the tree contains conflict markers or git reports unresolved merges.

Fix Merge Conflicts

Resolve conflicts by preserving intent, avoiding unrelated rewrites, and verifying the repository still passes the required checks.

More from this repository

same repository

debug-agent

bitsocialnet/spam-blocker

Systematic evidence-based debugging using runtime logs. Generates hypotheses, instruments code with NDJSON logs, guides reproduction, analyzes log evidence, and iterates until root cause is proven with cited log lines. Use when the user reports a bug, unexpected behavior, or asks to debug an issue.

2026-04-191

commit-format

bitsocialnet/spam-blocker

Formats commit titles and descriptions using Conventional Commits. Use when suggesting or writing git commit messages.

2026-04-081

context7

bitsocialnet/spam-blocker

Retrieves up-to-date docs for libraries and frameworks. Use when checking current Fastify, Vitest, Zod, or Node APIs before coding.

2026-04-081

deslop

bitsocialnet/spam-blocker

Removes overengineered or noisy AI-generated code from recent backend changes. Use when a diff reads as too defensive or too abstract.

2026-04-081

find-skills

bitsocialnet/spam-blocker

Helps discover and install useful agent skills for this repo. Use when a user asks how to do a recurring task or asks whether a skill exists for Fastify, Vitest, Zod, security review, or similar backend workflows.

2026-04-081

implement-plan

bitsocialnet/spam-blocker

Orchestrates a multi-task implementation by delegating backend slices to plan-implementer subagents. Use when the user provides a plan and wants it executed in parallel where possible.

2026-04-081

Run any Skill with one click