title: How to prevent editing same files using git by multiple users
body: <p>I am currently writing a paper in collaboration with a post doc for a conference. We investigated using version control software and git seemed to be a great candidate. Now we have to real experience with it and are facing some problems. Specifically that we sometimes edit the same files before pushing, resulting in errors for whoever wants to push second.</p>
  
  <p>What are some tips / tools / etc. one can use in order to prevent this simultaneous editing? I know git is used for big projects with many collaborateurs that do not face these problems, so what are we doing wrong?</p>
  
  <p>Any ideas? </p>