agentsclimarketplace
Sign in

Fix merge conflicts

Skill nota-america/forgecat-agent-profiles/profiles/cursor/plugins/cursor_plugins_team-kit/for-forgecat/skills/fix-merge-conflicts

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolutionFrom its SKILL.md

Install
npx -y skills add nota-america/forgecat-agent-profiles --skill fix-merge-conflicts

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

SKILL.md

1.0 KB, 171 tokens by cl100k_base, as published. Nobody here has run it

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 resolved files and summarize key decisions.

Guardrails

  • Keep changes minimal and readable.
  • Do not leave conflict markers in any file.
  • Avoid broad refactors while resolving conflicts.
  • Do not push or tag during conflict resolution.

Output

  • Files resolved
  • Notable resolution choices
  • Build/test outcome

What ships with it

Read from the repository

Just SKILL.md. No reference files, no scripts.

Keep looking

Skills are one crate of 325,949. Ordering is by how many stacks a row turns up in, so the top of any crate is what has actually been picked rather than what has the most stars.