Merge conflict after two people added files to installer.

[Antarctica]

When files(?) are added to the installer independently by two developers, the row

Code: Select all

<ROW Feature="MainFeature" Title="MainFeature" ...

is updated to reflect the changed values.

This causes a merge nightmare in git, since we have are one hundred and eighty values in the main feature, and all of them in this single line. Did I overlook something there that would reduce the number of values? Or could you change the AIP format in such a way that added files are one per line, not all in one?

Furthermore, both developers caused changes to the same file row, where only NextFile changed:

Code: Select all

<ROW File="Microsoft.IdentityModel.Xml.dll" Component_="Microsoft.IdentityModel.Xml.dll" ... SourcePath="..\.." SelfReg="false" NextFile="fullpagemasterbundle.js"/>

vs.

Code: Select all

<ROW File="Microsoft.IdentityModel.Xml.dll" Component_="Microsoft.IdentityModel.Xml.dll" ... SourcePath="..\.." SelfReg="false" NextFile="adalangular.bundle.js"/>

and now I am unsure what that means and how to fix.

Do you have any advice for this?

[Daniel]

Hello,

Please keep in mind we do not recommend at all to use the merge operation of your versioning control tool for our setup projects. When you need to commit a change in the setup project we recommend you to commit the AIP file entirely as a binary file.

Have a look on our "Git Merge Issues with AIP" thread debating similar topic.

All the best,
Daniel