Merging with diff3: the “three-way merge”

• Tahoe-LAFS

  9 1,277 9.6 Python

  The Tahoe-LAFS decentralized secure filesystem.

  

Then there are Darcs and Pijul, which use a theory of patches.

So Pijul manages to have lossless merges by actually storing a directed graph (though of course, you will still need to decide how to flatten that into a displayed file) :

https://jneem.github.io/pijul/

And because uses more information about the history, it is able to do smarter merges (if I am not mistaken, even compared to the OP ?) :

https://tahoe-lafs.org/~zooko/badmerge/simple.html

https://pijul.org/faq

• resolve-trivial-conflicts

  3 181 6.9 Haskell

  Become a conflict resolution hero

https://github.com/Peaker/git-mediate is an amazing secret weapon for making quick work of 3-way conflict resolution.

• InfluxDB

  www.influxdata.com sponsored

  Power Real-Time Data Analytics at Scale. Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.

  

Suggest a related project