Taking the time to learn how git works on a conceptual level and then how to resolve merge conflicts effectively is a worthwhile investment. Highly recommended

“only one person per file”

so we’ve reverted back to the rcs/cvs days?

“Cave Johnson here. We are implementing a new policy, effective immediately. The git blame command will now be used to blame individual programmers. The blamed party will temporarily be reassigned to our home appliances division to test our new line of giant washing machines by riding the spin cycle. Don’t worry, it’s perfectly safe, but we are not liable for personal injury or death.”

Might as well use Google drive… Or maybe actually learn to use git? The learning curve is steep but it’s worth investing in it