Tag: diff tools

Linking Perforce Merge to Git

Git's built in Merge conflict resolution is awful. Although all the information is there it is difficult to use for all but the simplest of conflicts. Luckily,...