25 packages found
Merge Tailwind CSS classes without style conflicts
A precommit hook to warn you about merge conflicts introduced with other branches of your app
Performs insert-updates of a couchdb document with configurable conflict resolution.
A git command-line conflict resolution tool. In the browser.
Merge Tailwind CSS classes without style conflicts
A git merge driver for Gettext .PO files
some interfaces for work with git repository
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
A simple CLI tool to resolve package.json merge conflicts.
Use an unrelated remote repository to apply a git diff
Resolve multiple image conflicts at the same time
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
A tool for fixing some of the worst of the npm shrinkwrap noise
Merge two simple javascript objects, with controllable logic for conflicts.
Utility to merge two Signal K objects, resolving conflicts using the timestamp of child objects.
(Fork) Use an unrelated remote repository to apply a git diff
Resolve data table conflicts one step at a time.
Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)
git merge driver specific for Salesforce.com Metadata
Manual merge tool