Text Merge Alignment Settings Session > Session Settings > Alignment |
![]() ![]() ![]() |
The Alignment tab settings control the algorithm for aligning lines in the comparison. The Standard method aligns the files by comparing successively smaller sections of each file. Parts of the alignment can be shown before the entire comparison is finished. Skew tolerance represents how far the algorithm will look for matches. When comparing files with many or large inserts, a larger tolerance can improve the alignment. The Use closeness matching option attempts to align the remaining mismatched lines based on their similarity. The Alternate method aligns the files using a common LCS (Longest Common Subsequence) algorithm. This can give better matches in certain cases, such as large inserts or when the files contain a lot of repeating text. Since files are compared all at once, larger file scans take much longer than the standard method, and the files are not displayed until the comparison is complete. It does not support similarity comparisons, so mismatches will be grouped in blocks. Select Unaligned to compare files without aligning lines based on their content. Mark the Never align differences checkbox to show lines with important differences as blocks of added and deleted text rather than changed text.
A merge conflict is... These settings define the scope of conflicts. A conflict occurs when the same section of text has changes on both left and right sides. Select Only different change lines to limit conflicts to where each line has changes on both sides. Select Left change and right change separated by lines to specify the maximum number of lines between changes that should be considered conflicts. This way, left and right changes that are close to each other can be flagged for review along with direct conflicts. |