git-consol

Git merge conflict resolution TUI

v1.0.2 URL: https://unpkg.com/git-consol@1.0.2

Open Browse Files

git merge conflict tui cli

tailwind-merge

Merge Tailwind CSS classes without style conflicts

v3.4.0 URL: https://unpkg.com/tailwind-merge@3.4.0/dist/bundle-mjs.mjs

Open Browse Files

tailwindcss tailwind css classes className classList merge conflict override

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

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

git-json-resolver

A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.

v1.3.7 URL: https://unpkg.com/git-json-resolver@1.3.7/dist/index.js

Open Browse Files

json merge conflict resolver git diff ours theirs package.json base config turborepo tooling react18-tools mayank1513