<araxis merge> Quick Overview file comparison and merging

Important file comparison and merging features are indicated below. Descriptive content for each feature can be found below.

Note: Only two-way comparisons/merges are shown, and the Pro version of merge also supports a three-to-one comparison/merge.

1. Folder Compare button

Clicking this toolbar button opens the folder comparison form. The folder comparison form lets you compare and synchronize the entire folder hierarchy.

2. Auto Merge button (only available for Professional Edition)

Clicking this button automatically merges the non-conflicting changes of the left and right files into the common three-to-one ancestor file in the middle.

3. Three-to-merge button (only professional version available)
Clicking this toolbar button switches to the three-to-one file comparison view.

4. Report button

Clicking this button creates a report that compares files in HTML, HTML slides, XML, and Unix diff formats. THML reports are useful for archiving and distributing.

5. Move the cable panel

Drag the connector panel to the left or right to change the relative position of the file comparison panel. Double-click Yes to restore it to the center.

6. Read-only and file change indicators

The icon on the left indicates that a file is read-only. You can edit a read-only file when you configure merge to allow it to edit read-only files. The icon on the right indicates that the file has been edited or modified since it began to compare. Note that read-only files are not allowed to be edited by default, but can be done if you want.

7. Text Delete block

This text block is only displayed on the left-hand side of the file. This connection line explicitly tells you that this text must be inserted to the right of the file to be the same as two files.

8. Merge button

Click the merge button to copy a text block to another file instead of the response block. Click and hold CTRL to insert instead of replace. Press Ctrl+shift and click to delete the text quickly.

9. Omit Row Count

By default, merge displays all lines of text that are not changed. However, you can also hide some or all of the text that is not changed. In this case an indicator shows how many rows are hidden.

10. Bookmarks

You can set a bookmark in a file to track your important position in the edit.

11. Vertical scroll Bar

When you scroll to a file, another file automatically scrolls to make the matching portions of the two files visible. When scrolling, hold down CTRL to prevent this from happening, so that only one file is scrolled.

12. Center Point Mark

When scrolling vertically, the merge attempts to align the matching portion of the file with the center point.

13. In-place editing

You can edit the file directly in place. When you make changes, the file comparison is automatically updated.

14. Summary Bar

It will give you a visual impression of the different ranges of files you are comparing. Each color-coded marker on the summary bar indicates a different point. You can click on the profile bar to jump directly to this specific change location.

<araxis merge> Quick Overview file comparison and merging