JSPM

A Vue directive to automatically merge tailwind classes on custom components. This plugin builds on the awesome work done by the "tailwind-merge" package.

NO MORE WAR! Spread peace and love, not hate. Forgive those that have hurt you, none of us are perfect.

Conflict free changelogs and release management

git merge driver specific for Salesforce.com Metadata

A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

Knex extension to insert on conflict do nothing

Merge tailwindcss classes

Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)

Utility function for conditionally joining and merging Tailwind CSS classes without style conflicts.

git merge driver for automatically merging lockfiles

Merge two files like git

CRDT in Vue.js

git merge driver for automatically merging resx files

forking content-addressed append-only historical key/value blob store over leveldb with multi-master replication

An scrollview(Android only) provide smoothly scroll experience for nested ScrollView.

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

Swagger mock util middleware

PG-specific ON CONFLICT DO upsert and safe insert for Bookshelf.js

Utility to automatically resolve composer.lock git conflicts

JS Network framework for offline first progressive web apps

AI-powered Git merge conflict resolver using GPT

Merge Tailwind CSS classes without style conflicts

GitPod helper command for project-specific environment variables.

Smart dependency compatibility checker that prevents peer dependency conflicts before you upgrade

Check if your PRs are in conflict.

Utility function for merging tailwind className conditionally for Tailwind CSS in JS.

(Fork) Use an unrelated remote repository to apply a git diff

Check for and report on module version conflicts for a package

git merge driver specific for Salesforce.com Metadata

Smart dependency compatibility checker that prevents peer dependency conflicts before you upgrade

用于检测vue单文件template模板中是否存在未处理的合并冲突遗留代码的webpack插件

Herm-js network tool package for powerful network packet transmission.

Determine free blocks from a list of events and free/busy rules.

husky hook used to check for git conflict

Merge Tailwind CSS classes without style conflicts

Herm-js document system for offline sync, and auto conflict resolution.

The Conflict-Free File System Network is a distributed file system network for securely authoring and sharing files.

stop contributors from commiting conflicts

The Conflict-Resolver Service (CSR) can be queried to provide a signed resolution about the non-repudiation protocol associated to an invoice being valid or invalid. It could be invoked by either the consumer or the provider. It is a core element of the C

A git command-line conflict resolution tool. In the browser.

TailwindCSS class canning utility for merging and conditional className strings.

Will do stuff with browserify

Simple, fast utilities for manipulating version vectors and vector clocks

Smart dependency compatibility checker that prevents peer dependency conflicts before you upgrade

Create a brand new Conflict app

Collects git conflicted files, saves a report and copies files for future review.

Check if NPM package names conflict

A tool for fixing some of the worst of the npm shrinkwrap noise

responzo is a Node.js utility package designed to simplify response handling in API applications. It provides a set of predefined response structures for various HTTP status codes, making it easy to format consistent API responses for both success and err

Smart dependency compatibility checker that prevents peer dependency conflicts before you upgrade

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

Fetch a dependency version tree for a package

A Babel plugin that automatically resolves conflicting star exports from barrel files.

Mongoose plugin for handling concurrent saves and updates of documents

The first and only UI framework for Discord bots

Manual merge tool

node-lei-routes-sort ====================

A scrollview doesn't intercept touch event while the user is try to scroll horizontal.

A library to detect potential conflicts between a remote branch and a local branch in a Git repository

Utility function to effectively merge tailwindcss in a readable format

Lets you check whether or not two given branches in your project would produce a conflict when attempting a merge or rebase

you are able to drag or click your html element, it's not conflicted.

NPM package name conflict test

An object-oriented abstraction of PouchDB using Backbone models and collections.

A simple JavaScript utility for conditionally joining Tailwind CSS classes together.

Detects when a (new) vinyl file is different than an existing file on the file system, and either prompts the user for action, skips the file, or calls a function on the file to determine the action to take.

Retry Mongoose saves that suffer from conflicts via VersionErrors

The first and only UI framework for Discord bots

Svelte helper for SyncedStore.

Transform a list of calendar schedules into metadata of availabilities and conflicts.

Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc. - A fork of gulp-conflict. Credit goes to Joakim Carlstein <joakim@klei.se>

Check if port reachable.

Merge Tailwind CSS classes without style conflicts

SyncedStore is an easy-to-use library for building collaborative applications that sync automatically. It's built on top of Yjs, a proven, high performance CRDT implementation.

合并Tailwind CSS类而不发生样式冲突

React hook useSyncedStore for SyncedStore.

Merge Tailwind CSS classes without style conflicts

A tiny utility for construction conditional CSS classes, with tailwind group variants and merging of identical classes