php-merge | 3 way merge like git in php

php-merge is a PHP library typically used in Utilities applications. php-merge has no bugs, it has no vulnerabilities, it has a Permissive License and it has low support. You can download it from GitHub.

When working with revisions of text one sometimes faces the problem that there are several revisions based off the same original text. Rather than choosing one and discarding the other we want to merge the two revisions. Git does that already wonderfully. In a php application we want a simple tool that does the same. There is the xdiff PECL extension which has the xdiff_string_merge3 function. But xdiff_string_merge3 does not behave the same way as git and xdiff may not be available on your system. PhpMerge is a small library that solves this problem. There are two classes: \PhpMerge\PhpMerge and \PhpMerge\GitMerge that implement the \PhpMerge\PhpMergeInterface which has just a merge method. PhpMerge uses SebastianBergmann\Diff\Differ to get the differences between the different versions and calculates the merged text from it. GitMerge uses GitWrapper\GitWrapper, writes the text to a temporary file and uses the command line git to merge the text.