The first and only UI framework for Discord bots
Turns off all rules that are unnecessary or might conflict with Prettier.
Check if NPM package names conflict
Conflict resolution for yeoman's generator/environment stack
Turns off all rules that are unnecessary or might conflict with Prettier.
TypeScript definitions for parse-conflict-json
Turns off all SCSS rules that are unnecessary or might conflict with Prettier.
Find potential conflict in your CSS files - to avoid surprises when used in the context of Micro Frontends.
A collection of utilities for working with JSON objects, including diffing, conflict resolution, bundling and more.
AI-powered git conflict resolution.
Grunt plugin for preventing you from accidentally comitting a merge conflict into your project
Flake ID generator yields k-ordered, conflict-free ids in a distributed environment
Parse a JSON string that has git merge conflicts, resolving if possible
A GraphQL transform that enabled object versioning and conflict resolution for a @model type.
A library of Conflict-Free Replicated Data Types for JavaScript.
Diffing and conflict resolution tool for JSON objects
A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.
Small utility library that check if a new file content can be merged safely in the on-disk existing file.
WorldWideView plugin covering conflict events features.
Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.
Turns off all rules that are unnecessary or might conflict with Prettier.
Conflict free changelogs and release management
WorldWideView plugin — Active conflict zones and geopolitical hotspots worldwide.
Conflict Resolution Shared
A CLI tool that detects cargo dependency conflicts.
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.
Notifies a developer of conflicts between his/her work and that of other developers
The gem help you find the conflict-calendars from calendars
ConflictDetector is a convenience class for saving the record, or returning the conflict.
Remove conflicts from structure.sql that are caused by tracking the schema_migrations.versions information.
Warn about the conflict between PRs.
Git command that shows the blame on the lines that are in conflict
Fix git conflicts in TSV file.
A gem plugin to warn you when you accidentally install files with names that collide accidentally
When some commits is pushed, add 'conflict' label to unmergeable pull request.
Automate tedious db/structure.sql conflict resolution
Conflict resolution with severity levels and postures for brain-modeled agentic AI
Resolve git merge conflicts in Rails encrypted credentials by decrypting, merging, and re-encrypting them. Works with merge, rebase, and cherry-pick.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.
No description provided.