Lets you check whether or not two given branches in your project would produce a conflict when attempting a merge or rebase
Integrate markdown styles into web components, Markdown CSS styles will not be conflicted.
Clean dropbox conflicted files
All dependencies must not be conflicted to correctly load by Eslint
Parse a JSON string that has git merge conflicts, resolving if possible
Collects git conflicted files, saves a report and copies files for future review.
Make the index look like it is shuffled according to the range so that it is not conflicted without the actual shuffle. Works in both Node.js and browser environments.
you are able to drag or click your html element, it's not conflicted.
A collection of Trump conflicted companies in an easy to use JSON format.
Make the index look like it is shuffled according to the range so that it is not conflicted without the actual shuffle.
GitWand CLI — resolve Git conflicts from your terminal or CI pipeline
TypeScript definitions for parse-conflict-json
custom lint rules built for Sayari Graph
Companies that work with Customs and Border Patrol on Trump's zero-tolerance border policy.
A utility that will resolve conflicted tailwind css classes, and return the last class name if there is a conflict
Focused in-Pi Git staging, diff review, and commit modal for agent-assisted coding workflows
Pi coding agent extension for Agent File Tools (AFT) — tree-sitter and LSP-powered code analysis
Reconcile overlapping PR changes from parallel AI agents
Graph viewer package for SwarmVault graph artifacts.
EXPERIMENTAL - USE WITH CAUTION - Sync forked/vendored dependencies with upstream using AI-powered Git 3-way merge
A performant CSS-in-JS theme management library for React
Runtime helpers for Mistflow-built apps. Imported by scaffolded apps for hybrid search, batched embedding, and other AI-app utilities.
CLI + stdio MCP + library SDK for the Unfairly multiplayer context layer — sync vaults, run agents, emit events
A distributed lock manager for NestJS
Avoid merge conflicts across git worktrees for parallel AI coding agents
Stacked diffs CLI for Bitbucket Server
Tries to minimise diff3-style git conflicts
Entity-level semantic merge CLI. Resolves conflicts at the function/class level instead of lines.
Non-conflicting implementations for optional fields
Entity-level semantic merge engine. Three-way merge at the function/class/method level instead of lines.
Git-native task tracker for parallel agent workflows
CellFabric CKB-settled cell intent core types and deterministic ordering primitives
A Rust library for analyzing and modeling character complexity and internal conflicts through various conflict axes.
CRDT-based coordination for multi-agent code editing. Entity-level claims, conflict detection, and version tracking.
MCP server for entity-level semantic merge coordination. 15 tools for agents to claim, merge, and resolve conflicts.
Git merge driver for entity-level semantic merging. Drop-in replacement for git's default merge strategy.
A gem to help editing rails credentials files with git merge conflicts.
Ensures consistent output of db/schema.rb despite local differences in the database
Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord
Git command that shows the blame on the lines that are in conflict
Kintsugi resolves conflicts in .pbxproj files, with the aim to resolve 99.9% of the conflicts automatically.
Provides a css-module-like experience to Sass/SCSS, Rails views and JavaScript
Utility function to efficiently merge Tailwind CSS classes without style conflicts.
Remove conflicts from structure.sql that are caused by tracking the schema_migrations.versions information.
Warn about the conflict between PRs.
Finds conflicts against open pull requests
Turns off all rules that are unnecessary or might conflict with prettier plugin ruby.
Ensure that your routes don't conflict. Main use cases are for dynamic routes that could conflict with resourcefully generated routes.