Merges lockfiles. Can automatically fix merge conflicts

Merges lockfiles. Can automatically fix merge conflicts

Parse a JSON string that has git merge conflicts, resolving if possible

Theia - Merge Conflicts Extension

Just a quick hack to be able to check the mergability of two branches ...

Created by Engr. Brian Perez to ease developer workflow and prevent git merge conflicts

Theia - Merge Conflicts Extension

Theia - Merge Conflicts Extension

Git merge driver for Salesforce metadata XML files - automatically resolves merge conflicts in profiles, permission sets, and 50+ metadata types

The built-in polling-gate suite (CI, merge-conflicts, post-release health + the on-call escalation) for the Agent Architecture Board, authored entirely through the public gate-registry seam — depends only on @cat-factory/kernel + @cat-factory/contracts, n

MCP server that detects semantic (non-textual) merge conflicts between Git branches using AST-level analysis

Composable atoms for spinning up real git repos in any state — merge conflicts, out-of-date submodules, multiple remotes, in-progress operations, multi-contributor history, and more. For tests, demos, and tool development.

Git workflow automation tool that enforces linear history and prevents merge conflicts

A simple CLI tool to resolve package.json merge conflicts.

Openresolve extension for pi (currently lists merge conflicts in TypeScript code)

A changelog manager to avoid merge conflicts.

Merge Tailwind CSS classes without style conflicts

merge-safe — Predict likely Git merge conflicts before opening a PR.

Gilp plugin to detect merge conflicts.

Git-hook-helper that deals with merge conflicts, linting, and testing, locally. Preventing bad code from being pushed.