Add option for conflict resolution between metadata#73

astropenguin wants to merge 9 commits into

mainastropenguin/typespecs:mainfrom

astropenguin/issue72astropenguin/typespecs:astropenguin/issue72Copy head branch name to clipboard