Merging Files
Merging files in DeltaWalker is easy and accurate thanks to:
- Contextual merge buttons.
- Powerful text editors offering in-place editing.
- Automatic, real-time re-comparison performed in the background as you edit the files.
- Unlimited undo/redo.
- Accurate and fast text comparison engine.
When DeltaWalker visualizes text files with differences it draws colored rectangles around the blocks of text that have been deleted, added, that match but have differences, or that, in the case of three-way comparison, match but have conflicting differences.
Reconciling files containing such differences usually involves:
- Replacing a difference in one file with a difference from another.
- Inserting a difference from one file at certain place into the other.
- Deleting a difference.
This is exactly the role of DeltaWalker's merge arrows.
DeltaWalker Oro supports automatic three-way file merge where two files are compared against a common ancestor and their differences are first detected and highlighted in reference to that ancestor, then merged into the ancestor. Automatic merge of non-conflicting differences is powerful, yet conceptually simple: it walks through all differences between the ancestor and the derivative works, i.e. first and second file, and merges, one-by-one all non-conflicting differences.
Together, three-way file comparison and automatic merge are designed to give you confidence in the final results and save you time when analyzing and reconciling two sets of different changes made to a common file.
Synchronizing folders
Synchronizing folders is powered by a flexible set of selection options and copy/move/delete operations. Everything executes on dedicated thread, keeping DeltaWalker's user interface responsive at all times.
Synchronizing a pair of folders comes down to executing one of more simple actions—selecting, copying, moving, and deleting files.
Automatic thee-way folder synchronization (Oro Edition only) operates identically to automatic file merge, however it operates on folders. Files containing