Merging C++ code files
2 answers
Hi, we just accepted a delivery and the system complained it did not know how to merge a CPP files (C++ source code), gave us a whole big list of possible merge schemes but we could not see easily which one was correct for C++ code.
Which method should we use?
For the vast majority of files (we have a mix of files including C, C++, C#, VB, ASP, and many more), you just have to use the Text merger - and the generic XML merger for any XML data formats (InstallShield install scripts, custom XML data etc).