@i3m/conflict-resolver-service

The Conflict-Resolver Service (CSR) can be queried to provide a signed resolution about the non-repudiation protocol associated to an invoice being valid or invalid. It could be invoked by either the consumer or the provider. It is a core element of the C

v1.3.0 URL: https://unpkg.com/@i3m/conflict-resolver-service@1.3.0/dist/index.js

Open Browse Files

crs conflict resolution conflict non-repudiation i3-MARKET i3m

git-conflicts

Manual merge tool

v1.5.0 URL: https://unpkg.com/git-conflicts@1.5.0/index.js

Open Browse Files

git merge tool mergetool rebase marker conflict resolution editor

sickmerge

A git command-line conflict resolution tool. In the browser.

v0.0.3 URL: https://unpkg.com/sickmerge@0.0.3/sickmerge.js

Open Browse Files

sickmerge git merge conflict command-line code-mirror resolution

herm-js-document

Herm-js document system for offline sync, and auto conflict resolution.

v0.3.5 URL: https://unpkg.com/herm-js-document@0.3.5/modules/index.js

Open Browse Files

herm-js javascript framework data sync conflict progressive apps offline