1. Before Dev B made changes they should have pulled the latest repo down. Then they would have the latest and greatest with less of a
chance that they will encounter conflicts.

2. No. There could be many collaborators pushing changes all of the time. You can do your best to mitigate the chance
that conflicts will occur by how you seperate the work or other things but it can't be competely avoided.