Search Results for "git mac"

Perform a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution. Reduce the pain of resolving merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each branch. Allow a merge to be saved, tested, interrupted, published, and collaborated on while it...

Given two trees of audio files, examine the metadata for each file to try and determine the differences in the content of the trees. This helps find duplicate songs (or non-duplicated songs) even if the music is stored in different formats. Toggles let you determine how specific the matching criteria must be: Track number and song name? Artist, album, and track length? All of the above? Ultimately this program will let you delete duplicates from either the left or right trees, or copy...