Skip to main content

NeVibeCode · 2 items

Skills and MCP tagged “merge-conflicts”

fix-merge-conflicts cursor skill Resolves merge conflicts in a branch, then checks the build and tests before wrapping up. Use it when several conflicted files need focused fixes without a refactor. Claude Code CX Codex Cursor +1 2,700installs resolve-conflicts tailcallhq skill Handles Git merge conflicts plan-first: audits the files, rebuilds lock files, rescues edits from deleted files, and asks you when the diff is ambiguous. Claude Code CX Codex Cursor +1 683installs

More in NeVibeCode

Project sponsors

Companies that keep this analytics open

Impressions, clicks and code copies — open statistics. We keep the numbers public for the same reason NeBlask itself is public. Become a sponsor