HomeGUI clientFile Type OptionsHow do I integrate a 3rd party diff and merge tool (e.g. Guiffy) with the PureCM GUI?

10.3. How do I integrate a 3rd party diff and merge tool (e.g. Guiffy) with the PureCM GUI?

To use another diff or merge tool with PureCM you need to add it to the file types you wish to use it with on each client.

You do this by going to the main options 'Tools > Options' and selecting 'File > Preferences'. This will list a number of file types which have preferences selected on that client.

 

If the file type you wish to use is there you can click the properties button, else you will need to add a new type. This will open up another property window. In this you can view both 'Diff Apps' and 'Merge Apps'.



If Guiffy is set as the default diff or merge tool for that file type on that computer, it should automatically be listed here. If not you will need to add it manually.

For the diff app my machine is using "%1 %2" as the parameters. "%1" is used for the base file path and "%2" is used for the new file path.

For the merge app my machine is using "-s -h1%5 -h2%6 -hm%7 %2 %3 %1 %4" as the parameters. "%1" is used for the base file path, "%2" for the path of a local copy of the server file, "%3" for the local file path, "%4" for the saved merge file path, "%5" for the server title, "%6" for the local title and "%7" for the merge file title.

If you wish PureCM to default to use another diff app you need to move this application to the top of the list. Otherwise you can select "Open with..." from right clicking on various things such as two revisions in the history dialog and this will give you the choice of all the application in the list for that file type.

To resolve a conflict using a different merge tool you need to right click on the file in the conflict window and select "All tasks > Resolve Using...". This will list all available merge tools. Or if Guiffy was at the top of the list you can right click and select “Resolve > Resolve Interactively...”. When you have finished merging in the selected tool you need to save the file. PureCM will ask if you wish to save the merged file, which you do. And this will resolve the conflict inside PureCM.

This page was: Helpful | Not Helpful