/

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, shipping, control-cli, control-ui, verify-this, test reliability, code cleanup, and work summaries. Designed to work without requiring third-party service integrations.

Created by CursorView Source

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

control-cliBuild or adapt a local harness to drive, inspect, and profile an interactive CLI or TUI without external services. Use for CLI UX checks, startup regressions, memory leaks, hangs, prompt flows, or terminal demos.

control-uiBuild or adapt a local browser/CDP harness to drive and inspect a web, IDE, or Electron UI. Use for local UI verification, screenshots, accessibility snapshots, perf profiles, visual diffs, or reproducing UI bugs.

deslopRemove AI-generated code slop and clean up code style

fix-ciFind failing PR checks, inspect logs or external check links, and apply focused fixes

ci-watcherWatch PR CI for the current branch and report pass/fail with relevant failure links. 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