Easy-to-use CUI for fixing git conflicts
- go
- golang
- git
- cui
Repository Index
47,133 repositories indexed
1–6 of 6 · Most stars
The open source air traffic simulator
- python
- traffic
- aircraft
- simulation
Your personal EQ coach. Build social skills and learn to handle conflict through realistic role-play and personalized feedback.
- ai-in-education
- communication-skills
- conflict-resolution
- llm
Terminal-native 3-way git mergetool and diff viewer
Erlang state "monad" with merge/conflict-resolution capabilities. Useful for Riak.
Conflict-free merge for DataFrames, JSON, ML models & distributed agents — powered by CRDTs. The first merge library where every operation is mathematically guaranteed to converge.
- collaborative-editing
- conflict-resolution
- crdt
- data-engineering