herm-js-document
Herm-js document system for offline sync, and auto conflict resolution.
sickmerge
A git command-line conflict resolution tool. In the browser.
git-json-resolver-semver
Plugin for git-json-resolver that applies semver-based merge strategies (max, min, secure, override) to resolve version conflicts in package.json and similar files.