Conflict Packages

git merge driver for automatically merging lockfiles

Use an unrelated remote repository to apply a git diff

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

Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.

A git merge driver for Gettext .PO files

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

git merge driver specific for Salesforce.com Metadata

git merge driver specific for Salesforce.com Metadata

Knex extension to insert on conflict do nothing

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

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

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

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

Will do stuff with browserify

git merge driver for automatically merging resx files

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>

Swagger mock util middleware

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

Retry Mongoose saves that suffer from conflicts via VersionErrors