#

three-way-merge

Here are 18 public repositories matching this topic...

GitSyncMarks

d0dg3r / GitSyncMarks

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.

github chrome-extension sync json gitlab firefox-addon gogs gitlab-ci bookmarks browser-extension bookmarks-manager gitsync gitee three-way-merge bookmark-sync manifest-v3 codeberg forgejo linkwarden

Updated Aug 10, 2026
JavaScript

GitStudioHQ / merge-studio

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.

git merge-conflicts conflict-resolution diff jetbrains vscode-extension cursor diff-tool merge-tool three-way-merge merge-editor

Updated Jun 24, 2026
TypeScript

eirikhalvard / master-thesis

Three-Way Semantic Merge for Feature Model Evolution Plans

thesis master master-thesis merge software-evolution feature-model feature-modeling three-way-merge software-merging

Updated May 16, 2021
TeX

noahsarkcc / smartdiff

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

python flask diff xml excel game-development spreadsheet merge vanilla-js configuration-management svn subversion three-way-merge gamedev-tools

Updated Jun 22, 2026
Python

DibbayajyotiRoy / rust-wasm-Library

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

rust cli diff typescript state-management wasm undo-redo optimistic-ui json-patch rfc-6902 json-diff patch three-way-merge react-hook json-pointer-

Updated May 20, 2026
TypeScript

charlesvdv / go-three-way-merge

A library to perform three-way merge in Go

golang library merge three-way-merge

Updated May 23, 2018
Go

CPS-IT / migrator

Composer package to migrate files by using 3-way merge

php diff patcher merge migration composer-library three-way-merge

Updated Aug 10, 2026
PHP

u7k4rs6 / CAIRN

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.

git java spring-boot version-control self-hosted code-search vcs packfile git-server blame systems-programming delta-compression merkle-dag content-addressable-storage system-design three-way-merge low-level-design smart-http myers-diff

Updated Jul 16, 2026
Java

merge-forge

ognjenmarcheta / merge-forge

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

diff ai vscode developer-tools vscode-extension cursor copilot git-merge merge-conflict three-way-merge

Updated Jul 27, 2026
TypeScript

vskstudio / naht

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

rust cli sync roblox developer-tools file-sync roblox-studio luau rojo three-way-merge roblox-development bidirectional-sync

Updated Jul 12, 2026
Rust

antunjurkovic-collab / collaborative-state-demos

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

json reconciliation protocol webassembly ietf three-way-merge interactive-demo collaborative-state

Updated Aug 5, 2026
TypeScript

ward / three-way-merge-finder

git merge three-way-merge

Updated May 8, 2023
Rust

KimiyaVahidMotlagh / Threeway_Mergesort

Three way Merge sort project

python mergesort jupyter-notebook data-structures three-way-merge

Updated May 11, 2024
Jupyter Notebook

vedatkara / Merge-QuickSortComparison

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

java sorting quicksort mergesort sorting-algorithms time-complexity merge-sort quick-sort two-way-merge-sort three-way-merge time-complexity-analysis time-complexity-comparison

Updated Apr 8, 2023

edeori / Git-Conflict-Resolver-VSCode-plugin

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

git conflict-resolution diff vscode vscode-extension monaco-editor source-control smartgit merge-conflict three-way-merge

Updated Aug 3, 2026
TypeScript

DualNative / libdualnative-v1

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

rust json webassembly wasm deterministic jcs three-way-merge content-addressing rfc8785 state-reconciliation

Updated Aug 2, 2026
Rust

brickster241 / GitEngine

Git rebuilt from first principles in Go — 17 commands incl. three-way merge (diff3) and rebase, byte-for-byte SHA parity with native git proven by a differential suite. 2× faster bulk ingest, 28.5K obj/s fsck. ▶ Playable sandbox: brickster241.github.io/GitEngine

Updated Aug 9, 2026
Go

petfold / recordstore

Versioned key→record store over a content-addressed blob store: atomic commits, snapshots, lock-free three-way merge

python database ethereum decentralized versioning swarm bee snapshot-isolation web3 radix-trie key-value-store content-addressed-storage three-way-merge ethereum-swarm

Updated Aug 6, 2026
Python

Improve this page

Add a description, image, and links to the three-way-merge topic page so that developers can more easily learn about it.

Curate this topic

Add this topic to your repo

To associate your repository with the three-way-merge topic, visit your repo's landing page and select "manage topics."