Devart Code Compare 文件合併工具

£100.00

Code Compare 用於比較和合併不同的文件和文件夾。Code Compare 與所有流行的源代碼控制系統集成:TFS、SVN、Git、Mercurial 和 Perforce。

貨號: Devart Code Compare-1 分類: , 標籤: , ,

描述

Devart Code Compare 文件合併工具

產品特色

Text Comparison and Merging

  • Colored blocks for inserted, deleted, and modified text
  • Detailed highlighting of changes within lines
  • Collapsing of unchanged text regions (CodeCompare Pro-feature)
  • Point-and-click merge with a mouse
  • Editing files on the fly with a reliable file compare tool
  • Merging shortcuts for advanced users

文本比較

Semantic Source Code Comparison

  • Structure comparison mode – comparing sources via their signature and not only by their location.
  • Lexical comparison from major programming languages – C#, C++, Visual Basic, JavaScript, Java, XML
  • Syntax highlighting for programming languages
  • Matching methods in compared source code files
  • Similar lines of code are matched even after refactoring
  • Detecting moved blocks of code if source code is reordered in files
  • Displaying changes in code structure in Difference Explorer
  • Code outlining for collapsing and expanding regions of code

Folder Сomparison

  • Advanced diff directories compare utility
  • Color-coding for added, deleted, and modified files
  • Filtering options for excluding or including certain file types
  • Instant opening of individual file comparison documents
  • Display options for better comparison result analysis
  • Batch file copying from pane to pane or to a selected folder

Folder Comparison

Visual Studio Integration

  • Compare code without leaving your favourite environment
  • Native Visual Studio extension for smooth integration
  • Visual Studio 2015, 2017, and 2019 supported
  • Choose to use standalone or integrated Code Compare on the fly
  • Link Code Compare to Android Studio as an external tool to compare and merge code

Version Сontrol Integration

  • Colored blocks for inserted, deleted, and modified text
  • Integrates with version control systems as the merging tool for conflicting file revisions
  • Non-conflicting changes are merged automatically
  • Merging conflicts are highlighted
  • One-click conflict resolution with a mouse button
  • Three-way comparison to compare and merge three files side-by-side

版本比較

版本比較

Features Free Pro  
 
Two-way text comparison and merge Yes Yes Screenshot
Folder comparison and merge Yes Yes Screenshot
Visual Studio integration Yes Yes Screenshot
Windows Explorer integration Yes Yes Screenshot
Command line interface and VCS integration Yes Yes  
Text editor with search and bookmarks Yes Yes  
Use Intellisense while comparing code Yes Yes Screenshot
Syntax highlighting for multiple languages Yes Yes  
Show changes within compared code lines Yes Yes Screenshot
Three-way text comparison and merge No Yes Screenshot
Automatic Files Merging No Yes  
Structured code comparison* No Yes Difference
Changes navigation window** No Yes Screenshot
Moved code blocks detection* No Yes Difference
Similar code lines detection No Yes Difference
Code outlining (folding) No Yes Screenshot
Unchanged regions collapsing No Yes Screenshot
Word-by-word text comparison No Yes Difference
Line-by-line text comparison No Yes Difference
       

* The feature supports the following languages: C#, C++, JavaScript, Java, Visual Basic, and XML.

** Used with the ‘Structured code comparison’ feature.

系統需求

系統需求

Client machine requirements:

  • 2 GHz or higher processor
  • 1024 MB of RAM or more
  • 35 MB of free hard drive space
  • Microsoft Windows Vista/Windows 7/8.x/10
  • Visual Studio 2010, 2012, 2013, 2015, 2017, and 2019 (except the Express editions), or Visual Studio Integrated (+ Isolated) Shell 2013
  • DirectX 9 compatible video card running at 1024 x 768 or a higher-resolution display

Server machine requirements:

  • SQL Server 2017, 2016, 2014, 2012, 2008, 2008R2 (including Express editions), LocalDB 2012 or higher (usually delivered with Visual Studio 2012 and higher versions)
  • 2 GHz or higher processor
  • 1024 MB of RAM or more
  • 100 MB of free hard drive space to store a database
  • Windows Server 2008 or higher
  • .NET Framework 4.0 or higher installed. You can download .NET Framework here.

Note:

.NET Framework 4.x is pre-installed in Windows 8.x, Windows 10 and Windows Server 2012.