Merge a "main" branch into a separate branch of a model or versioned folder

[pjmonks]

Description

At the moment, you can only merge changes from a model/versioned folder from a new branch back into the "main" branch (draft) model/versioned folder, but you cannot do this the other way around. For example, in this scenario:

• You can select the "Merge" option to merge branch "CR8000" to "main"
• You currently cannot merge "main" to "CR8000"

The second case is important too because changes may have been made to "main" whilst the other branch has been idle or worked on, so the latest "main" changes should be able to be committed back to the other branch for consistency.

[OButlerOcc]

Not a ui change, actually a security change see Pr: MauroDataMapper/mdm-core#460

[OButlerOcc]

Reopened for a question, I can now merge a main Version Folder into other branches, Do I want to also be able to merge individual models inside? Security policies seems to indicate folder only but task is a tad ambigious on this

[jamesrwelch]

@OButlerOcc I would say it only really makes sense to merge whole VFs at a time - if you were to merge single models within a VF you'd likely end up with dangling links - references to things that didn't exist.

[pjmonks]

@OButlerOcc and @jamesrwelch - I think if I remember correctly, a merge diff is allowed on a standalone model so long as it is not inside a versioned folder - the VF takes precedence over sub-models within it. So a merge, either as main -> branch, or branch -> main, should apply to:

• Models (Data Model, Terminology, Code Sets etc) not inside a VF
• Versioned Folders
• But not models inside a Versioned Folder