PDA

View Full Version : iam_xml files merge conflicts



ramalaks
09-24-2008, 10:40 AM
We are maintaining install anywhere files in the clear case. one persons started with windows installer using installanywhere. Another person from different location worked on the same project file to add changes for linux. when checking in, we face merge conflicts. how to solve this problem?

pv7721
09-24-2008, 11:22 AM
Can you detail what sort of conflicts are these? AFAIK the .iap_xml project file is something which behaves itself very badly in respect to any source control system. Often, for a single line modified it modifies countless IDs so if two different persons have opened the same project but saved at different moments, most likely IA itself got confused between those two concurrent changes...

ramalaks
09-24-2008, 01:31 PM
the file is the iap_xml. the advantage of clear case is that 2 people can work on their development stream and merge to the integration stream. when clearcase merges, we see merge conflicts and list 500 of them. i am not sure is it was same line or diff. line/action as it depends on how long /how many changes a person is work on.