JSPM

Check if NPM package names conflict

Check if an NPM package name is taken

Detect potential file system conflicts and if necessary prompt the user before overwriting files.

some interfaces for work with git repository

Common utility commands for Git repositories.

Remove conflicts from a semver range

Assist in CouchDB conflict resolving.

A Node.js CLI tool that automatically resolves conflicts in package.json and package-lock.json files

A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.

CLI to automatically check if your current repo branch has any conflicts with all other repo's branches. Really useful when working with big teams.

A precommit hook to warn you about merge conflicts introduced with other branches of your app

Detects when a new file is different than an existing file and prompts the user for action.

Common utility commands for Git repositories.

Custody plugin to clear port conflicts between processes

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

A NPM package to fix all git conflicts of a file at once.

A tool to analyze and resolve conflicting URL redirects.

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.