In plain English
Sometimes the same data is changed in different ways that cannot all fit together. Conflict resolution is the rule that decides which version stays, or whether the edits are combined. It applies when two or more edits clash.
In context
Here, "Conflict resolution" means the rule you choose for deciding which incompatible versions of the same data are kept or how they are combined.
- Situation
- Connecting integrations, syncing data, and running imports or exports
- What it communicates
- advanced setting label for choosing how differing versions are handled
Meaning limits
The term by itself does not say which version will win or whether combining the edits is possible.
Examples
“When two clerks edited the same customer record differently, the conflict resolution kept the newer phone number and merged the notes.”
“The manager chose a conflict resolution for records that both branches had edited in different ways.”