Merge Tool
Guiffy includes
our Advanced cross-platform Merge Tool, SureMerge. The Guiffy
Merge Tool is available for Windows, MacOS, and Linux/Unix
systems. Our merge tool supports 2-way and 3-way (auto)
merging. The Guiffy Merge Tool includes a command line
interface and API for automation and integration with your other tools.
Some of Guiffy's Advanced Merge Tool capabilities:
- Merge text files in over 150 encoding formats such
as Unicode-8, Unicode-16, MBCS, SJIS, Big5,
etc.
- Merge files with different end-of-line formats -
the Guiffy merge tool ignores end-of-line format
differences.
- Some merge tools try to be "smart" and auto merge
changes when both versions added code at the same place.
Not, SureMerge.
- Attentions focus beyond Conflicts - the Guiffy
merge tool detects changes close to one another, not just
those which overlap.
There are several Merge Tools. But, only a couple merge tools
are available on Windows, MacOS, and Linux/Unix. And only the
Guiffy merge tool support all of today's possible
file encoding formats and comes with a command line interface and API.
You may not need all of Guiffy's Merge Tool features
today... But, what about tomorrow?
SureMerge is the only
merge tool designed from day one to provide a trustworthy
3-way auto-merge - which requires its own algorithm. Other
merge tools were developed as an enhancement to a diff tool
and try to apply its "unique anchors" file compare algorithm
for the 3-way merge solution. The authors of the "unique
anchors" compare algorithms admit, "applying the compare
algorithm to a 3-way merge is problematic". Put simply: Most
of the time, it works... Sometimes, it doesn't!
Here's a quote from one of
our customers:
"... after trying this tool I'm sure it will save me hours
(if not days) of pain the next time I have to merge my own
TGE repository with the latest GG HEAD! ....I think it's
definitely worth the money!"
.........................
Stefan Moises
on GarageGames.com
Read more
about our Trustworthy SureMerge... -OR-
Download our
free evaluation Now and make Guiffy SureMerge your merge tool for
today and tomorrow...
|
