fix-merge-conflicts

To automatically resolve git merge conflicts, this skill detects conflicting files and conflict markers, then applies minimal, correctness-first edits that preserve both sides when safe to produce a clean, buildable state.

Yes, you can non-interactively fix merge conflicts while ensuring code compiles by applying safe edits, regenerating lockfiles as needed, and running compile, lint, and test suites to validate the resulting codebase.

The best way to handle divergent feature branches and maintain CI stability is using automated conflict resolution that applies minimal edits, regenerates lockfiles, and validates the build to ensure the codebase passes CI tests.

Yes, automated conflict resolution works with lockfile regeneration and test suites by requiring tooling to regenerate lockfiles, run compile and test suites, and summarize resolution decisions for review before committing.

This approach handles conflict markers by detecting them with git status, applying correctness-first edits to resolve them, and summarizing the resolution decisions so the resulting codebase is ready for commit review.

You should avoid automated merge conflict resolution when conflicts require complex semantic logic that cannot be safely resolved with minimal, correctness-first edits or when lockfile regeneration and CI test validation are not available.