Agent skill · cursor

fix-merge-conflicts

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

Reference it in any coding agent with:

@skills cursor/fix-merge-conflicts