I would add sth like "you should avoid that by pulling and pushing in atomic portions" and otherwise contact the admins - not sure if I would let anyone resolve conflicts as this might screw up other people's work