scaslin

We have different merge behaviour when using a cloaked.conf file. Normally when submitting changes with no conflicts the merge is automatic and works great. When using a cloaked.conf we always get a manual merge dialog even when there isn't any conflicting files, we also end up with a fat branch. Why is this happening? what is the fix? Thanks, Steven