Oooh, you just gave me a thought of mine! My bedside stand was a hand-me down from a college friend in the 90s. So I’ve been using that for close to 30 years now.

I think the idea is both are adding new files and also making changes to various files but his commits to the non-new files caused the conflict. Also, if both new files affect the same deliverable (like a DLL) then that could create a conflict in some cases (though I think that all depends on the build system).

What is this? Photoshop Fryday?

To be fair, there are some good ones out there. I worked for a drug-rehab company in the 90s as the IT head that got mostly government funding for a 6 month-rehab-program for non-violent drug offenders (mostly stuff like heroine, cocaine, etc.). We also had an in-prison program but I don’t think that was as effective. Of course to get government contact money we would have to meet lots of strict guidelines too.

I definitely more wary of ones that don’t get any public funding and therefore have practically no guardrails and less forced transparency.

You absolutely should keep on watching YT. In fact I can specifically highly recommend the channel DukeUnivLibraries. This video with almost 1M views will sway in just the first 15 seconds but you will not be able to peel your eyes away for the entire 3 minutes and 14 seconds. Prepare yourself. Get some popcorn. https://youtu.be/e1iGEM9NMFM