Description 5a5ft

High performance directory compare and merge. This is iOS version of Treeit, a small utility provides an intuitive and concise interface to combine the content of two big folders. It accomplish the task in two steps, at the first step, the app scan the source and target folder to find out the difference, removed, new added, modified and conflicts in the source and target folder, and at the same time, optionally check all duplicated files in both folder. At the second step, the app merge the difference with selected strategy. In addition, of course, also can directly use the app to generate coloured changes between two plain text file. Features --------------------------- a. Generate file list for removed, new added, duplicated, modified and conflicts in source and target folder. b. Select single, multiple or all files in the file list to perform delete or merge operation. c. Pair modified and conflicted source and target files together for conveniently review them before merging. d. Redo failed files one by one, log detailed status of the merging operation for each file. e. Generate coloured changes between source and target file, line by line, character by character. f. Detect difference of binary file with content and file attributes when do comparing operation. g. Merging strategy includes: "always overwrite", "keeping the newest", and "keep both". h. Speed up comparing by a filter file, ignore particular folder and files by defined rules. Compared Result Types --------------------------- a. "+": this file or folder does not exist in target folder. b. "-": this file or folder does not exist in source folder. c. "O": can't do an overwrite operation, the file was conflicted with target file or folder. d. "M": this file was modified comparing with the target file. e. "R": this file should be renamed, it was conflicted with target file, content is different. f. "D": duplicated file in source folder or target folder. Merge Strategy --------------------------- 1. "Always overwrite": Overwrite the target file mandatorily if there's a file have same file name existing in target folder. 2. "Keeping the newest": Compare the modified date time of source file and target file and keeping the newest, the source file will overwrite the existing target file if source file is newer. 3. "Keep both": Copy the source file to target file located folder, and rename that file, file name have the format, "target file name+N.ext", N is a number automatically increased. 3m196d