Merging LAR files

[Pete van de Water, módosítva 13 év-val korábban]

Does anyone have experience / ideas on how to merge concurrent changes to Liferay LAR files? We have circumstances where two developers have configured new portlets or pages and also that the client's marketing department are configuring portlets to point to new content.

I can see that the exported LAR file is a compression of a lot of xml files in a directory hierarchy but unfortunately the folders in the directory are numbered and under certain conditions (yet to be determined) re-generate in a whole new number range making merging all but impossible.

Any pointers would be greatly appreciated.

Thanks, Pete