use `merge_base_octopus()` #5490

Byron merged 2 commits intogitbutlerapp:mastergitbutlerapp/gitbutler:masterfrom

Byron:tree-mergeByron/gitbutler:tree-mergeCopy head branch name to clipboard