Fix Merge Conflicts

cursor

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

Install

The individual skill folder is not confirmed. This command opens the repository’s skill selector; follow the upstream instructions.

skills CLI

npx skills add cursor/plugins

Agent Host E2e TestsMicrosoftOfficialUse when writing, recording, updating, validating, or troubleshooting Agent Host end-to-end and real-provider integration tests under src/vs/platform/agentHost/test/node/e2e and providerIntegration. Covers adding a cross-provider test, re-recording fixtures after an SDK bump, required cross-platform Azure validation, gating non-deterministic or platform-specific tests, and diagnosing replay…Testing & QA194.2k Repository stars
Component FixturesMicrosoftOfficialUse when creating or updating component fixtures for screenshot testing or their shared infrastructure, or when designing UI components to be fixture-friendly. Covers fixture file structure, theming, service setup, CSS scoping, async rendering, validation, and common pitfalls.Testing & QA194.2k Repository stars
Flaky Smoke TestsMicrosoftOfficialDiagnose intermittent VS Code Electron smoke-test failures from the Azure DevOps Flaky Smoke Tests pipeline (definition 700). Covers finding failed iterations, downloading task logs and platform artifacts with Azure CLI, correlating cumulative runner logs, tracing the introducing commit, and queueing focused validation runs.Testing & QA194.2k Repository stars
Integration TestsMicrosoftOfficialUse when running integration tests in the VS Code repo. Covers scripts/test-integration.sh (macOS/Linux) and scripts/test-integration.bat (Windows), their supported arguments for filtering, and the difference between node.js integration tests and extension host tests.Testing & QA194.2k Repository stars
LaunchMicrosoftOfficialLaunch and automate VS Code Insiders with the Copilot Chat extension using @playwright/cli via Chrome DevTools Protocol. Use when you need to interact with the VS Code UI, automate the chat panel, test the extension UI, or take screenshots. Triggers include 'automate VS Code', 'interact with chat', 'test the UI', 'take a screenshot', 'launch with debugging'.Testing & QA194.2k Repository stars
Unit TestsMicrosoftOfficialUse when running unit tests in the VS Code repo. Covers the runTests tool, scripts/test.sh (macOS/Linux) and scripts/test.bat (Windows), and their supported arguments for filtering, globbing, and debugging tests.Testing & QA194.2k Repository stars

Install

Related