hn_acc_1
The bit about top-down vs. bottom-up design (Liquid Fuel Engine (SSME) section) is surprising to me. It appears for the Shuttle program, all the years of knowledge on how to successfully complete engineering projects with large CAPEX + large risk was just ignored.
If the conflict is huge, rebasing can help you by "playing" the commits from one branch one at a time so the conflicts are smaller / easier to fix.
At a previous job, a team was forced to use checkout-style VCS due to their manager's unfounded fear of merge conflicts; I couldn't go in that office without hearing one developer shout to another: "Hey, can you finish up and check in that file so I can get started on my changes?"
The monorepo/polyrepo discussion exists apart from your choice of version control system and has little to do with Git, as far as I can tell