Board index » off-topic » Merge operation failed
Eric
Delphi Developer |
Merge operation failed2005-07-06 10:56:12 PM off-topic7 I am using the cross platform client 6.0. When I use the ST View manager, it finds some files that require a manual merge. when I double click on it, it produces this error: "Merge operation failed". From what I remember of when I had manual merges previously, it should bring up the visual merge utility. And if I recall correctly, it used to bring up the visual diff utility when double clicking on a manual merge file when preview the merge operation. Any help on why my merge operation is failing would be greatly appreciated. I have uninstalled and reinstalled the software already. Thanks in advance. -Eric |