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).

How many of those are real serious recalls that they didn’t just fix with easy tweaks over the air? I hate Musk as much of the next guy but I follow a lot of EV YT channels and even the ones that don’t like Tesla acknowledge that the media overhyped the recalls given how many of them have been easy OTA fixes. Plus since they iterate very fast and don’t just update the car once every four years often it only affects a small subset. Like 1-4k cars in some cases rather than the typical 100k recall that Toyota would have.