Adopt equivalent server-rebased branches#344

skarim wants to merge 3 commits into

skarim/rebase-onto-amended-commitsgithub/gh-stack:skarim/rebase-onto-amended-commitsfrom

skarim/sync-server-rebasesgithub/gh-stack:skarim/sync-server-rebasesCopy head branch name to clipboard