/

fix-merge-conflicts

Cursor Skill

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

Internal workflows used by Cursor developers for CI, code review, and shipping. Covers the full dev loop: CI monitoring and fixing, PR creation, merge conflicts, smoke tests, compiler checks, code cleanup, and work summaries.

Created by CursorView Source

check-compiler-errorsRun compile and type-check commands and report failures

deslopRemove AI-generated code slop and clean up code style

fix-ciFind failing CI jobs, inspect logs, and apply focused fixes

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

get-pr-commentsFetch and summarize review comments from the active pull request

ci-watcherWatch GitHub CI for the current branch and report pass/fail with relevant failure logs. Use when waiting for CI results or CI has failed. Use proactively to monitor branch CI.

no-inline-importsKeep imports at top of file and avoid inline imports

typescript-exhaustive-switchUse exhaustive switch handling for TypeScript unions and enums