feat: teach merge to optionally error on duplicates#4971

danking merged 5 commits intodevelopvortex-data/vortex:developfrom

dk/merge-optionally-errors-on-duplicatesvortex-data/vortex:dk/merge-optionally-errors-on-duplicatesCopy head branch name to clipboard