Git Stars Git Stars

#conflict-resolution Repositories

Discover 10 active open source GitHub repositories tagged with #conflict-resolution, accumulating 20,332 total stars (averaging 2,033 stars per project). Leading this topic is automerge/automerge with 6,747 stars.

10
Total Repositories
20,332
Total Stars
2,033
Avg Stars/Repo
1
automerge/automerge

A JSON-like data structure (a CRDT) that can be modified concurrently by different users, and merged again automatically.

automerge
โญ 6,747 JavaScript ๐Ÿ‘ค automerge Organization ๐Ÿ• Updated 2026-11-20 ๐Ÿ“… Created 2019-12-26
2
bcpierce00/unison

Unison file synchronizer

bcpierce00
โญ 5,596 OCaml ๐Ÿ‘ค bcpierce00 User ๐Ÿ• Updated 2026-09-20 ๐Ÿ“… Created 2016-02-24
3
YousefED/SyncedStore

SyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.

YousefED
โญ 1,854 TypeScript ๐Ÿ‘ค YousefED User ๐Ÿ• Updated 2024-03-01 ๐Ÿ“… Created 2021-05-02
4
Ataraxy-Labs/weave

Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.

Ataraxy-Labs
โญ 1,364 Rust ๐Ÿ‘ค Ataraxy-Labs Organization ๐Ÿ• Updated 2026-11-21 ๐Ÿ“… Created 2026-02-06
6
Lightricks/Kintsugi

A tool to automatically resolve Git conflicts that occur in Xcode project files

Lightricks
โญ 1,072 Ruby ๐Ÿ‘ค Lightricks Organization ๐Ÿ• Updated 2026-09-19 ๐Ÿ“… Created 2021-04-19
7
pgEdge/spock

Logical multi-master PostgreSQL replication

pgEdge
โญ 769 C ๐Ÿ‘ค pgEdge Organization ๐Ÿ• Updated 2026-11-20 ๐Ÿ“… Created 2022-12-29
8
ostinelli/syn

A scalable global Process Registry and Process Group manager for Erlang and Elixir.

ostinelli
โญ 705 Erlang ๐Ÿ‘ค ostinelli User ๐Ÿ• Updated 2026-11-11 ๐Ÿ“… Created 2015-06-10
9
TUDelft-CNS-ATM/bluesky

The open source air traffic simulator

TUDelft-CNS-ATM
โญ 581 Python ๐Ÿ‘ค TUDelft-CNS-ATM Organization ๐Ÿ• Updated 2026-10-12 ๐Ÿ“… Created 2015-04-01
10
rhysd/conflict-marker.vim

Weapon to fight against conflicts in Vim.

rhysd
โญ 536 Vim Script ๐Ÿ‘ค rhysd User ๐Ÿ• Updated 2024-05-20 ๐Ÿ“… Created 2013-10-11

Frequently Asked Questions

1

What is the most popular #conflict-resolution repository on GitHub?

The top ranked open source #conflict-resolution project on GitHub is automerge/automerge with 6,747 stars. A JSON-like data structure (a CRDT) that can be modified concurrently by different users, and merged again automatically.

2

Which programming languages are most used in #conflict-resolution repositories?

Among the top ranked #conflict-resolution projects on GitHub, the most common programming languages are C, JavaScript, OCaml, TypeScript.

3

How is the #conflict-resolution repository ranking calculated?

We track 10 active open source repositories tagged with #conflict-resolution (500+ stars), totaling 20,332 stars with an average of 2,033 stars per repository. Rankings update daily from the GitHub API.