I'm wondering if anyone has successfully implemented a strategy for merging iap_xml files with version control tools such as git.

These "xml files" are extremely difficult to merge across branches since they spit out a lot of random numbers which are changed every time the file is saved. For example:

<object class="com.zerog.ia.installer.Installer" objectID="73005c37b664">

The objectID will often change, causing tons of merge conflicts, even though we've made no modifications to that particular piece of the installer.

I'd love for Flexera to implement some kind of persistent objectID to avoid these crazy merge conflicts, or have some kind of guideline to properly merge these files.