**Real-time Git merge conflict detection with line-level accuracy.**

Code Change Guardian — a multi-model code review and Git workflow automation CLI for Claude Code: divergence-aware review, risk-aware model routing, AI merge-conflict resolution, and a graphical pre-push gate.

Lightweight Git merge conflict pre-check CLI.

Fast, small, compiled class-name merging for Tailwind CSS. Drop-in replacement for clsx + tailwind-merge.

Tells you how long it's been since the last merge conflict

A free, open-source Git GUI — commit graph, stashes, branch management, and a visual merge conflict editor. Works with local repos, GitHub, and self-hosted GitLab.

Merge Tailwind CSS classes without style conflicts

A Bonjour DNS-SD service announcer via mDNS on UDP

Sync layer for AI agents working on the same repo: presence, soft path claims, and overwrite warnings before the merge conflict. Claude Code hooks + CLI + MCP server.

Merge objects using their property descriptors

Default VSCode extension designed to be used with @codingame/monaco-vscode-api

Variant of merge that's useful for webpack configuration

git merge driver for automatically merging lockfiles

Yjs-backed merge conflict resolver for Eidos action() — automatic CRDT merge for 'merge'/'custom' conflict strategies.

Simplify your schema by combining allOf into the root schema, safely.

merge() utility function

Detect git merge conflict markers in source files. Zero dependencies.

diff-conflict-marker is a command-line tool that reads the saved file state from `.git` and converts the `diff` into a merge-conflict marker format. This enables easier line-by-line inspection and review of changes.

Small utility library that check if a new file content can be merged safely in the on-disk existing file.

Runs prettier as an stylelint rule