Search results
79 packages found
Manual merge tool
Just a quick hack to be able to check the mergability of two branches ...
An scrollview(Android only) provide smoothly scroll experience for nested ScrollView.
Detect potential file system conflicts and if necessary prompt the user before overwriting files.
- api
- app
- application
- base
- baseplugin
- building-blocks
- conflict
- conflicts
- create
- error
- exist
- existing
- file
- filepath
- View more
Create a brand new Conflict app
Merge tailwindcss classes
Transform a list of calendar schedules into metadata of availabilities and conflicts.
git merge driver specific for Salesforce.com Metadata
git merge driver for automatically merging resx files
(Fork) Use an unrelated remote repository to apply a git diff
A simple CLI tool to resolve package.json merge conflicts.
The Conflict-Free File System Network is a distributed file system network for securely authoring and sharing files.
PG-specific ON CONFLICT DO upsert and safe insert for Bookshelf.js
An object-oriented abstraction of PouchDB using Backbone models and collections.
A combination of Tailwind-Merge and CLSX
git merge driver specific for Salesforce.com Metadata
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>