My hot take is the quickest way out of this quagmire is to abandon Git. With the education system & bootcamps raising the next generation to think MS GitHub is Git, it would probably be less work to start rolling with another VCS as megacorp Microsoft won’t have the agility to pivot away from Git. Git isn’t even that great—arcane CLI, patches don’t commute, basically permanently locks in your name & email, large files require a separate tool, etc. And most of the popular alternative forges are literally just trying to clone MS GitHub rather than invent something new or solve the shit problems it doesn’t like threading, pull request model sucks, source code doesn’t need to be a social media platform with gamified stars & anxiety-inducing activity charts to encourage that MIT code in your free time the corpos will use & never contribute back while demanding you use it to build your résumé… or it’s built on email as the common denominator with fingers in ears as if mailing lists are the optimal workflow for all projects when a majority of folks don’t even know how to bottom post & keep their mail with the same evil Microsoft or the other evil Google. Nothing is being bold enough to actually have a better user experience—currently the best lure is… free software, but worse UX? Being a better UX the Microsoft GitHub is not a even that high of a bar. Some folks claim “network effect” but it seems clear that a lot of folks already want out.

Nah. Start anew. Check out Darcs, Pijul, Fossil, Mercurial, Bazaar, or whatever else is out there. Build on the ideas that improve version control.