Frequent merge conflicts in generated Articy content
Posted: Tue 10. Mar 2020, 08:54
Hi everybody,
we use Articy draft in all of our Unity projects. Unfortunately, there is one thing we constantly struggle with, which is the generated Articy content always causing merge conflicts between different developers. Even if the actual content is the same, there are always IDs that differ.
Those conflicts are a hassle most of the time, that's why it's "faster" for us to "clear generated files" and reexport and reimport the Articy draft export file, each time we do a merge. Still it takes a lot of time, all in all, which feels somewhat unnecessary, not even mentioning the times where things go wrong and Unity crashes while trying to automatically import the conflicted export-file.
I see this is not necessarily a problem on the side of Articy, but I wonder if anybody has found a good solution for this or got an idea for such? How do you deal with generated Articy content in git and resulting conflicts?
we use Articy draft in all of our Unity projects. Unfortunately, there is one thing we constantly struggle with, which is the generated Articy content always causing merge conflicts between different developers. Even if the actual content is the same, there are always IDs that differ.
Those conflicts are a hassle most of the time, that's why it's "faster" for us to "clear generated files" and reexport and reimport the Articy draft export file, each time we do a merge. Still it takes a lot of time, all in all, which feels somewhat unnecessary, not even mentioning the times where things go wrong and Unity crashes while trying to automatically import the conflicted export-file.
I see this is not necessarily a problem on the side of Articy, but I wonder if anybody has found a good solution for this or got an idea for such? How do you deal with generated Articy content in git and resulting conflicts?