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, it is¬†relatively¬†easy to wire up a third party diff and merge tools to help. Setting up as a diff tool. You can download the Perforce Visual Merge Tool […]