SemanticMerge Screenshots

<strong>About SemanticMerge</strong><br /><br />

Visual Merge explaining a refactor

Visual Merge helps you understand how the file was modified by the contributors.

<strong>Visual Merge explaining a refactor</strong><br /><em><p>Visual Merge helps you understand how the file was modified by the contributors.</p>
</em><br /><br />

Visual Diff

Visual Diff focuses on two contributors only, to better understand individual differences.

<strong>Visual Diff</strong><br /><em><p>Visual Diff focuses on two contributors only, to better understand individual differences.</p>
</em><br /><br />

Scenario definition

A method is moved to a different location but SemanticMerge can still merge it.

<strong>Scenario definition</strong><br /><em><p>A method is moved to a different location but SemanticMerge can still merge it.</p>
</em><br /><br />

SemanticMerge detects the method conflict

Even when the method has been moved by one contributor, SemanticMerge clearly detects the conflict.

<strong>SemanticMerge detects the method conflict</strong><br /><em><p>Even when the method has been moved by one contributor, SemanticMerge clearly detects the conflict.</p>
</em><br /><br />

Conflict solved

The developer can click on the merge button to solve the method conflict.

<strong>Conflict solved</strong><br /><em><p>The developer can click on the merge button to solve the method conflict.</p>
</em><br /><br />

Visual Merge explaining the scenario

Visual Merge helps understanding the scenario and how the code was refactored.

<strong>Visual Merge explaining the scenario</strong><br /><em><p>Visual Merge helps understanding the scenario and how the code was refactored.</p>
</em><br /><br />

Scenario definition

The same method added by two developers on two different versions and in different places.

<strong>Scenario definition</strong><br /><em><p>The same method added by two developers on two different versions and in different places.</p>
</em><br /><br />

SemanticMerge detects the added code

SemanticMerge is able to detect that the code is the same, even when it was added from different locations.

<strong>SemanticMerge detects the added code</strong><br /><em><p>SemanticMerge is able to detect that the code is the same, even when it was added from different locations.</p>
</em><br /><br />

Scenario definition

Two “using” methods added in different places,

<strong>Scenario definition</strong><br /><em><p>Two “using” methods added in different places,</p>
</em><br /><br />

Semantic handles the “using” references automatically.

The conflict in the using area is automatically solved by SemanticMerge.

<strong>Semantic handles the “using” references automatically.</strong><br /><em><p>The conflict in the using area is automatically solved by SemanticMerge.</p>
</em><br /><br />