WIP use unique merge-base as merged Main tree for assim'd merge commits

Just wanted to archive the commit without cluttering up the branches list, by using https://github.com/blog/1335-tidying-up-after-pull-requests (they keep a "Restore" button around, accessible from this closed PR).