Merge Tool
Guiffy eXpert includes
our cross-platform Merge Tool, SureMerge.
SureMerge provides trustworthy 3 way (auto) file
merging with change conflict detection and user editing/resolution.
SureMerge includes a command line
interface and API for seamless integration with other applications.
The Guiffy Merge Tool is available for Windows, MacOS, and Linux/Unix
systems.
|
SureMerge™ - Guiffy's 3 way Merge Tool |
 |
(Clickon the above image to view the screenshot)
|
Some of Guiffy's most advanced Merge Tool capabilities:
- Merge text files in over 150 encoding formats such
as Unicode-8, Unicode-16, MBCS, SJIS, Big5,
etc.
- 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 - Our SureMerge Merge Tool
detects changes close to one another, not just
those which overlap.
- Hybrid algorithm - SureMerge
detects and avoids the type of move changes which can cause diff3 based merge tools to produce corrupt merge results.
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 are based on a diff tool
and its "unique anchors" algorithm. 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!
Plus, Guiffy's Merge Tool fits into your environment...
Integrations supported include: Git, SVN, ClearCase, Perforce and many more...
- Git integration - Integration built into
Git mergetool.
- Integration - API for integration into applications.
CLI for automation with other tools.
Here's a quote from one of
our customers:
"... after trying this merge 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 Merge Tool, SureMerge...
-OR-
and make Guiffy SureMerge your merge tool, trusted for today and tomorrow...
|
