56,436 packages matching “merge-conflict-resolution”
dsh-git-panel
v0.1.19 · 7 days ago
DSH web GUI git panel: branch management, commit graph, VS Code-style side-by-side diff with merge-conflict resolution, and workspace file-tree change badges.
No known vulnerabilities
git-consol
v1.0.2 · 11 months ago
Git merge conflict resolution TUI
No known vulnerabilities
gitsynth
v0.3.0 · 1 year ago
GitSynth - Automatic Merge Conflict Resolution
No known vulnerabilities
dnssd-advertise
v1.1.6 · 3 months ago
A Bonjour DNS-SD service announcer via mDNS on UDP
No known vulnerabilities
@mcgrapeng/ccg
v4.2.0 · 3 months ago
Code Change Guardian — a multi-model code review and Git workflow automation CLI for Claude Code: divergence-aware review, risk-aware model routing, AI merge-conflict resolution, and a graphical pre-push gate.
No known vulnerabilities
git-merge-forge
v1.1.6 · 6 months ago
Modern browser-based Git merge conflict resolution tool with a multi-repo dashboard, three-pane Monaco editor, pre-merge conflict prediction, character-level diff, BASE pane, auto-resolve, and an AI assistant supporting Claude, OpenAI, Gemini, xAI, and Ol
No known vulnerabilities
cn
v0.4.0 · 1 day ago
Fast, small, compiled class-name merging for Tailwind CSS. Drop-in replacement for clsx + tailwind-merge.
No known vulnerabilities
parse-conflict-json
v6.0.0 · 4 months ago
Parse a JSON string that has git merge conflicts, resolving if possible
No known vulnerabilities
tailwind-variants
v3.3.1 · 1 month ago
🦄 Tailwindcss first-class variant API
No known vulnerabilities
@yeoman/conflicter
v4.2.0 · 21 days ago
Conflict resolution for yeoman's generator/environment stack
No known vulnerabilities
tailwind-merge
v3.7.0 · 11 days ago
Merge Tailwind CSS classes without style conflicts
No known vulnerabilities
merge-dirs
v0.2.1 · 10 years ago
node module to synchronously and recursively merge files from one folder to another
No known vulnerabilities
@rushstack/heft-config-file
v0.20.15 · 1 day ago
Configuration file loader for @rushstack/heft
No known vulnerabilities
@aws-amplify/datastore
v5.1.12 · 2 days ago
AppSyncLocal support for aws-amplify
No known vulnerabilities
merge-descriptors
v2.0.0 · 2 years ago
Merge objects using their property descriptors
No known vulnerabilities
@google/jules-merge
v0.1.0 · 6 months ago
Reconcile overlapping PR changes from parallel AI agents
No known vulnerabilities
webpack-merge
v6.0.1 · 2 years ago
Variant of merge that's useful for webpack configuration
No known vulnerabilities
npm-merge-driver
v2.3.6 · 6 years ago
git merge driver for automatically merging lockfiles
No known vulnerabilities
@kb-labs/core-config
v2.117.0 · 1 month ago
Core configuration system for KB Labs products, including schema validation, resolution, and merging
No known vulnerabilities
@stoplight/json-schema-merge-allof
v0.8.0 · 2 years ago
Simplify your schema by combining allOf into the root schema, safely.
No known vulnerabilities