Conflicts Packages

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

some interfaces for work with git repository

Assist in CouchDB conflict resolving.

Check for conflicts, and get prompted for action (when needed), before writing a file to disk.

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

Remove conflicts from a semver range

Check if NPM package names conflict

Check if an NPM package name is taken

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

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

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.

Suppress already existing files in a vinyl stream.

checks diff between files and returns the file with the difference with comments to help solve the conflict

Custody plugin to clear port conflicts between processes

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.

Common utility commands for Git repositories.

Common utility commands for Git repositories.