edit conflict in French
edit conflict in French
conflit de modification
(computing) An instance of two people trying to edit the same file or document simultaneously.