== Credentials or "evil twin" ==
This sample shows divergent changes done in parallel by two developers on the same file.

The two developers add the function 'credential_write' but they have different code in their bodies and they are located in different positions of the file.

A regular text-based tool will not detect any pending non-automatic conflicts. It will merge the case automatically but the resulting code will not compile.

SemanticMerge detects the conflicts correctly and helps you do the merge. Since it parses the code, it knows there can be two different declarations with the same name.

An optimal solution for this scenario requires that you configure an external 2-way merge tool (like BeyondCompare or Axosoft, since our built-in text-based merge tool doesn’t do 2-way merge). You can configure an external merge tool from the configuration dialog, under 'external tools'.