description | mx3r is a program which merges different versions of the same file in a single one, it is particularily useful when the standard merging process fails |
owner | deavidsedice@gmail.com |
last change | Mon, 21 Apr 2008 20:04:58 +0000 (21 22:04 +0200) |
URL | git://repo.or.cz/mx3r.git |
https://repo.or.cz/mx3r.git | |
push URL | ssh://repo.or.cz/mx3r.git |
https://repo.or.cz/mx3r.git (learn more) | |
bundle info | mx3r.git downloadable bundles |
content tags |
mx3r unifies files that have been developed by different programmers who have worked independently, each using their own code. So, for instance, let's say you want all the features added by developer A, and all the features added by developer B in a single file.
A standard merging, or diff-patch process, might result in a series of rejects that you'll have to sort out manually, thus wasting a week or two solving problems
In the future, when mx3r becomes fully fit for use, it will be able to solve conflicts between files. It will receive the BASE, REMOTE and LOCAL files from a SCM like GIT or SVN, for example, and then, it will try to determine what happened from file A to B, and from A to C, to, finally, replay the A->B changes into C, and the A->C changes into B. The process ends when B and C are almost the same file.
16 years ago | master | logtree |