| English | French |
| conflict detection | détection de conflit (The process of determining which operations were made by one replica without knowledge of the other, such as when two replicas make local updates to the same item) |
| conflict resolution method | méthode de résolution des conflits (The method that is used to determine which change is written to the store in the event of a conflict. Typical conflict resolution methods are as follows: last writer wins, source wins, destination wins, custom, or deferred. For custom resolution, the resolving application reads the conflict from the conflict log and selects a resolution. For deferred resolution, the conflict is logged together with the conflicting change data and the made-with knowledge of the change) |
| conflict resolver | outil de résolution des conflits (A special mechanism which handles resolving of conflict situations) |
| device conflict | conflit de périphériques (A conflict that occurs when the same system resources have been allocated to two or more devices. System resources include interrupt request (IRQ) lines, direct memory access (DMA) channels, input/output (I/O) ports, and memory addresses) |
| sync conflict | conflit de synchronisation (A conflict that occurs when data differences between data stored in one location and a version of the same data in another location cannot be reconciled) |
| synchronization conflict | conflit de synchronisation (A conflict that occurs when data differences between data stored in one location and a version of the same data in another location cannot be reconciled) |
| write conflict | conflit d'écriture (A situation that occurs when a user is trying to make simultaneous changes to the same object or simultaneous changes to other objects that have attributes referencing this object) |
