Fix Merge Conflicts

by cursorccb5507cec15No license10K starsListed Oct 8, 2026Updated Oct 8, 2026Repository updated today

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

AI-generated overview

Resolves git merge conflicts non-interactively, validates the build and tests, and summarizes the resolution.

What it does: This skill guides an agent through resolving unresolved git merge conflicts: it detects conflicting files from git status and conflict markers, resolves each with minimal correctness-first edits, and regenerates lockfiles using package manager tools. It then runs compile, lint, and relevant tests, stages the resolved files, and reports files resolved, notable resolution choices, and build/test outcome.
When to use it: Use it when a branch has unresolved merge conflicts and needs a reliable path to a buildable state. It fits situations where conflicts should be resolved without interactive prompts and verified by compiling and testing.
Requirements: Requires a git repository with unresolved merge conflicts, plus the project's package manager, compiler, linter, and test tooling needed to validate the result. It ships no scripts; it is instructions only.

Fix merge conflicts

Branch has unresolved merge conflicts and needs a reliable path to a buildable state.

Detect all conflicting files from git status and conflict markers.
Resolve each conflict with minimal, correctness-first edits.
Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
Regenerate lockfiles with package manager tools instead of hand-editing.
Run compile, lint, and relevant tests.
Stage resolved files and summarize key decisions.

License: No license

Content belongs to its original authors. SourceWeft indexes it from a public repository.