Merge conflicts. Elements missing from a new module
I want to merge a dev branch into the mainline. In this dev branch there is a module that is not yet in the current mainline. When I merge, it doesn't put the entire module in the mainline, but parts are missing (assocations, microflows, enumerations and pages). I’ve already double checked the last version of this dev branch and it’s the correct one. If I try to merge the mainline into the dev branche, the same elements (assocations, microflows, enumerations and pages) be removed in the dev branche and it’s not possible to reverse this with 'resolve conflict' in the ‘changes’ tab. what could be the cause of this and how can it be solved?