Fix resume when local metadata branch is stale + preserve diverged refs#1252

Soph wants to merge 3 commits into

mainentireio/cli:mainfrom

soph/fix-resume-stale-local-metadata-branchentireio/cli:soph/fix-resume-stale-local-metadata-branchCopy head branch name to clipboard