Self-hosted alternatives to fix-merge-conflicts
5 self-hosted AI Skills apps to use instead, best rated first.
Top picks
- C
claude-to-deerflow
Launchclaude-to-deerflow is an agent skill that lets an assistant send messages and questions to a running DeerFlow instance through its HTTP API. DeerFlow is an AI agent platform built on LangGraph that orchestrates sub-agents for research, code
Self-hosted
- O
open-notebook
Launchopen-notebook is an agent skill for organising research with Open Notebook, a self-hosted alternative to NotebookLM. It arranges sources, notes and AI conversations into research notebooks. Sources can be PDFs, web pages, audio, video and O
Self-hosted
- R
Reactive Resume
LaunchReactive Resume is a free and open-source resume builder for writing resumes and cover letters, checking the work, and tracking job applications. You create a free account, import an existing resume or start from scratch, and see the finish
Open sourceSelf-hosted
- S
self-hosted-funnel-launch
LaunchSelf-hosted funnel launch is an agent skill that takes a funnel from an empty install to published on infrastructure you control, using the Autonnel funnel builder, which is licensed Apache-2.0. The result covers a landing page, checkout, a
Self-hosted
- G
get-convex/convex-backend
LaunchConvex is an open-source reactive database for web app developers. It combines a database, a place to write server functions in pure TypeScript, and client libraries that keep the app's data live, so screens update as the data changes. Beca
Self-hosted
About fix-merge-conflicts
fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests
fix-merge-conflicts is an agent skill from Cursor's plugins collection for resolving merge conflicts without interactive prompts and bringing a branch back to a buildable state. It is triggered when a branch has unresolved conflicts and needs a reliable route to something that compiles. The workflow detects every conflicting file from the git status output and the conflict markers, then resolves each conflict with minimal, correctness-first edits. Where it is safe, the skill prefers keeping both sides of a conflict. Otherwise it chooses the variant that compiles and keeps public behaviour stable. Lockfiles are regenerated with the package manager rather than edited by hand, which avoids inconsistent dependency trees. The agent then runs the compiler, the linter and the relevant tests, stages the resolved files, and summarises the key decisions so a reviewer can follow them. The guardrails keep the edits focused on the conflicts themselves. The skill suits developers who regularly rebase or merge long-running branches and want the mechanical part of conflict resolution handled while they check the decisions. It is listed on skills.sh, where the page shows install counts and GitHub stars for the Cursor plugins repository, and its security audits all pass, including Gen Agent Trust Hub, Socket and Snyk. Install it with npx skills add https://github.com/cursor/plugins --skill fix-merge-conflicts.
- Price
- Free
- Made by
- cursor
- Category
- AI Skills
- Website
- github.com/cursor/plugins/fix-merge-conflicts