4 ms·

I imagine the with a code base the size of Google you code is constantly being added so you have no hope of merging with the master branch and getting the code

• archangel_one 14y ago
  Not really - there are thousands of engineers and bazillions of files in the code base, but any single file you're working on is still unlikely to have hundreds of other engineers frantically changing it at the same time as you. The last company I worked at had 8 other engineers (at the most) and if anything I probably saw more merge conflicts there.
  • tiziano88 14y ago
    Even if multiple people change the same file at the same time, it does not necessarily require a manual merge, except when the changes conflict with each other (e.g. add a line at the same position in base and head branches), so the automatic merge does its job most of the times.