Prevent Git merge conflicts by claiming files before you edit them
Two people on a team open index.html on the same afternoon, and neither knows about the other. If their edits overlap, whoever pushes second gets told to pull first. The pull stops on a conflict, and