three-way-merge

Browser extension for bidirectional bookmark sync with Git (GitHub, GitLab, Codeberg, Gitea & more). One JSON file per bookmark, three-way merge, auto-sync, multiple profiles. Chrome & Firefox & Companion App. Linkwarden, Smart Search. Add via Git, CLI, or Actions. No middleman.

The merge editor for VS Code and Cursor — a real three-pane merge editor with color ribbons, a conflicts dashboard, undo history, and a side-by-side diff.

Three-Way Semantic Merge for Feature Model Evolution Plans

SheetMeld: semantic diff and three-way merge tool for spreadsheet-based config data (.xml/.xlsx/.xls) with optional SVN integration

Fast WebAssembly JSON diff for JS/TS. Real JSON Pointer paths, applyPatch, revertPatch, RFC 6902 output, undo/redo, 3-way merge, React hook, CLI.

A library to perform three-way merge in Go

Composer package to migrate files by using 3-way merge

Git-for-research: a research-native version control system. Content-addressed immutable artifacts, semantic per-type diffing, three-way prose merge, CRDT concurrency, and first-class research provenance. Built for a 13h hackathon.

JetBrains-style three-pane visual merge conflict resolver for VS Code and Cursor, with optional AI that helps with conflicts.

The seam between your filesystem and Roblox Studio — bidirectional, conflict-safe, never destructive. A Rust alternative to Rojo.

Self-hosted Git host on a from-scratch VCS engine in Java: content-addressable object store, packfiles with delta compression, three-way merge, and smart-HTTP transport, all cross-verified against the real git binary.

Three-way JSON merge that returns structural conflicts instead of last-writer-wins

Compares time complexity of two sorting algorithms. Merge and Quick Sort.

Side-by-side diff and merge tool for Linux, built with Qt 6. Both sides stay editable while comparing, folder comparison and three-way merge included. Runs without KDE Frameworks.

Bounded deterministic JSON three-way merge and RFC 8785 content identities for Rust and WebAssembly. Experimental alpha.

SmartGit-style three-way (Ours | Result | Theirs) merge editor for VS Code — resolve Git conflicts without leaving the editor.

Browser-only interactive demos for deterministic collaborative-state Internet-Drafts.

Idempotent scaffolding with a recorded base: re-run without duplicating blocks or clobbering edits

Provider-agnostic optimistic concurrency for .NET. Submit a base revision plus a diffgram; get an arbitrated field-level merge.