Currently a main branch of a version folder or a model cannot be merged into a branch.
This is a ui problem as it functions fine as far as the back end is concerned.
This update edits the allowed actions for these types of object to allow them to be merged.
We add the MERGE_INTO_ACTION into the allowed admin actions for these types of model/folder, the ui then generates the merge ui for them
Currently a main branch of a version folder or a model cannot be merged into a branch. This is a ui problem as it functions fine as far as the back end is concerned. This update edits the allowed actions for these types of object to allow them to be merged. We add the MERGE_INTO_ACTION into the allowed admin actions for these types of model/folder, the ui then generates the merge ui for them
closes: https://github.com/MauroDataMapper/mdm-ui/issues/854