3-way merge in JavaScript or PHP

Question

Does anyone know of an Open Source three-way merge implementation in JavaScript or PHP? I want to merge plain text files without the need to rely on any server side binaries.

I found a few solutions for creating diffs, but no merge implementations.

score 4 · Answer 1 · answered Sep 17 '10 at 08:28

4

Not exactly three-way merge, but Google's "Diff Match and Patch libraries offer robust algorithms to perform the operations required for synchronizing plain text". And the implementation is available in Java, JavaScript, C++, C#, Lua and Python.

answered Sep 17 '10 at 08:28

user207825

51
3

score 3 · Accepted Answer · answered May 11 '10 at 10:37

3

Synchrotron looks good. E.g. see the demo of three-way merge and conflict-handling.

answered May 11 '10 at 10:37

Beni Cherniavsky-Paskin

8,228
1
42
55

Yes, looks great. Thank you very much! – Andreas Gohr May 12 '10 at 11:23
Synchrotron seemed to have some bugs when merging for me, but it may work for you. I'd be interested if there are any other JavaScript libraries – Knio Sep 17 '10 at 08:58

Krassmus · Answer 3 · 2016-09-12T18:25:57.577

1

Just finished my work on such a js- and php-tool. Have a look and enjoy:

https://github.com/Krassmus/Textmerger

You'd just need to write

var merged = Textmerger.get().merge(original, mytext, theirtext);

or in PHP

$merged = Textmerger::get()->merge($original, $mytext, $theirtext);

and you're done.

edited Sep 12 '16 at 18:25

answered Sep 12 '16 at 17:54

Krassmus

179
1
6

3-way merge in JavaScript or PHP

3 Answers3