azerbini / eamena_dev

Arches is a web-based, geospatial information system for cultural heritage inventory and management.
GNU Affero General Public License v3.0
1 stars 2 forks source link

Added check to merge_at if the mergenode already exists in parent mor… #135

Closed TeriForey closed 5 years ago

TeriForey commented 5 years ago

…e than once, it will merge in at the root

Description of Change

entity.merge_at will only merge if the merge node exists precisely once or 0 times in the parent node. Changed this to merge at root if there are more than 1 mergenodes in the parent.

Issues Solved

Types of changes

Checklist

Further comments