Search results
7 packages found
Sort by: Default
- Default
- Most downloaded this week
- Most downloaded this month
- Most dependents
- Recently published
git merge driver for automatically merging lockfiles
- npm
- lockfiles
- package-lock.json
- npm-shrinkwrap.json
- shrinkwrap
- pkglock
- git
- merge
- driver
- conflict
- merge conflict
- resolve conflict
- automerge
- autoresolve
published version 2.3.6, 5 years ago3 dependents licensed under $ISC
35,081
Grunt plugin for preventing you from accidentally comitting a merge conflict into your project
published version 0.0.2, 11 years ago1 dependents licensed under $BSD
900
git merge driver specific for Salesforce.com Metadata
published version 0.1.29, 4 years ago0 dependents licensed under $MIT
102
git merge driver specific for Salesforce.com Metadata
published version 0.1.7, 4 years ago0 dependents licensed under $MIT
39
git merge driver for automatically merging resx files
published version 1.0.0, 7 years ago0 dependents licensed under $ISC
15
git merge driver for automatically merging lockfiles
- npm
- lockfiles
- package-lock.json
- npm-shrinkwrap.json
- shrinkwrap
- pkglock
- git
- merge
- driver
- conflict
- merge conflict
- resolve conflict
- automerge
- autoresolve
published version 2.3.7, 4 years ago0 dependents licensed under $ISC
13
Gilp plugin to detect merge conflicts.
published version 0.0.10, 4 years ago0 dependents licensed under $MIT
6