I had this same problem too. With my team, whenever someone needs to edit the project file, we shout it out. 'Changing project file!'. They make their changes and push. Everyone then pulls the new file and go on their merry way. It's a bit of a pain, but it works and we rarely have conflicts now.