Currently we are merging two branches and are having a lot of issues when it comes to the Schema/DataSets. A large part of the problem comes from the auto-generated code being moved around.
I’m curious if anyone has encountered this problem, and what solutions or tools they used to solve it.
If the issue is strictly with generated code, I usually don’t even try to merge the branches.
I will accept one or the other and, once the rest of the code is merged, I will re-generate the code.