It's all about the answers!

Ask a question
QuestionsTagsUsersBadges
Guidelines | FAQ
Follow this question
Question details

×42,880

question asked: Jul 02 '10, 1:54 p.m.
question was seen: 7,230 times
last updated: Jul 02 '10, 1:54 p.m.

Related questions

Merging C++ code files

0
Chris Abbott (76●1●14●12) | asked Jul 02 '10, 1:54 p.m.
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?

2 answers

Most liked answers ↑|Newest answers|Oldest answers

0
permanent link
Duncan Lilly (66●10●4) | answered Jul 05 '10, 6:10 a.m.
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).
0
permanent link
Chris Abbott (76●1●14●12) | answered Jul 13 '10, 4:44 a.m.
Thanks

Your answer

Register or to post your answer.


Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.