P4Merge Not Launching for HTML Merge Conflicts in RoboHelp (GIT + P4V configuration)
Hello,
I’m working with RH 2002.3.93. I’m not using a newer version due to compilation processes in PowerShell that don’t work with those versions.
I’ve recently started using Git + P4V as my source control setup. I’m working on Windows 11.
When there’s a conflict between the sources (HTML files in the P4V depot) and the file I want to push, the differences are written directly into the HTML code of the file. Specific tags are inserted into the HTML file so I can identify the conflicting parts. This is really not practical. Unfortunately, I don’t have an example to share right now because my access to P4V is temporarily unavailable.
Normally, I’d expect P4Merge to be used, but that’s not happening. P4Merge is set as my default diff tool in P4V.
My question is: Is this the expected behavior?
If not, how can I make P4Merge the interface used for merges so that my HTML files are no longer modified during conflicts?
Thanks a lot for your replies.
