Audience
Developers interested in a solution to resolve merge conflicts and deploying source code changes
About Code Compare
Over 70,000 users actively use Code Compare while resolving merge conflicts and deploying source code changes. Code Compare is a free compare tool designed to compare and merge differing files and folders. Code Compare integrates with all popular source control systems, TFS, SVN, Git, Mercurial, and Perforce. Code Compare is shipped both as a standalone file diff tool and a Visual Studio extension. Download Devart Code Compare and manage code changes with ease! Colored blocks for inserted, deleted, and modified text. Collapsing of unchanged text regions (CodeCompare Pro-feature). Editing files on the fly with a reliable file compare tool. Compare code without leaving your favorite environment. Link Code Compare to Android Studio as an external tool to compare and merge code. Integrates with version control systems as the merging tool for conflicting file revisions. Three-way comparison to compare and merge three files side-by-side.
Pricing
Starting Price:
$69.95 one-time payment
Integrations
Company Information
Devart
Founded: 1998
Czech Republic
www.devart.com/codecompare/
Videos and Screen Captures
DiffMerge
DiffMerge is an application to visually compare and merge files on Windows, OS X and Linux. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting file. Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical or different. Right-click on any two files in Windows Explorer to diff them immediately. Rulesets and options provide for customized appearance and behavior. Identical feature set on Windows, OS X, and Linux. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. DiffMerge is a UNICODE-based application and can import files in a wide range of character encodings.
Learn more
TortoiseMerge
Version control is all about having the history of your working progress. But to really see and check the history, you must be able to see and check what has changed between two points in time, for example, what has changed between two releases of your product, or what was changed to fix a bug, etc. This is where TortoiseMerge helps. It is a diff/merge software tool for Windows with a tight integration for TortoiseSVN. At least for files that consist of text, TortoiseMerge can help you here. It shows you the two versions of a file side-by-side, coloring every modified line in that file. When you reformat your code or text, sometimes you don't really change anything but only split a long line into multiple ones, or you merge multiple lines into one. TortoiseMerge marks such changes with a white circle on the left gray bar of each view. If you see such a white circle, you know that no real changes were made, only changes in whitespaces.
Learn more
P4Merge
P4Merge tracks and compares the effects of past and pending work for branches and individual files. You can even use it to resolve conflicts (especially with Git). See the differences between file versions and easily resolve conflicts with P4Merge. Need to know what changed during a certain time frame? Folder Diff reveals history between any two points in time. Overlay two images to easily isolate pixel-level changes. Highlight and edit text file differences. Choose to include or ignore line endings/white spaces. Recognize line-ending conventions for Windows, Mac, and Unix. Display line numbers when comparing and merging files. See what code needs to be resolved in pending merges. Exclude files that are modified, unique, or unchanged. Organize modified assets in familiar file/folder hierarchy. Compare JPEG, GIF, TIFF, BMP, and other file formats. Overlap images or display side-by-side to view changes.
Learn more
Active File Compare
Active File Compare is an advanced utility for the comparison and synchronization of any text files in visual mode, it reports the results of the comparison in two side-by-side windows on the screen, the differing lines being marked with special color icons. This utility is an excellent tool for comparing source code versions since it allows you to correct the source code and also supports syntax highlighting for the programming languages C++, C#, Java, Visual Basic, Delphi, Object Pascal, SQL, Perl, Assembler, Fortran, Foxpro etc. and for HTML, PHP, XML, INI and BAT files. You can also use it to manage the source code when several independent authors make changes. The algorithm of comparing is designed in such a way that it's always very accurate in finding differences both in small text files and in files with a large number of changes. Active File Compare has its own file manager consisting of two side-by-side windows.
Learn more
You Might Also Like
With the world of work changed forever, it’s essential to manage your workplace and assets together to effectively create a high-performing environment. The Eptura experience combines the power of workplace management software with asset management, enabling you to effectively operate your building and facilitate hybrid work.
Product Details
Platforms Supported
Windows
Training
Documentation
Webinars
In Person
Videos
Support
Phone Support
24/7 Live Support
Online