In plain English
Sometimes the same data has been changed in more than one version, and the changes cannot all fit together automatically. Resolving the conflict means choosing which changes stay, which are removed, or whether parts of them are combined as the versions are synchronized.
In context
Here, "resolve conflict" labels the action of deciding how incompatible changes between versions of the same data will be handled during synchronization.
- Situation
- Creating, saving, sharing, versioning, and restoring files
- What it communicates
- labels the action for handling an edit or sync conflict.
Meaning limits
The term itself does not say which version will be chosen or whether the changes will be combined.
Examples
“When both laptops changed the same calendar entry in different ways, Priya resolved the conflict by keeping the new date and merging the notes during synchronization.”
“If the tablet copy and the online copy changed the same task differently, resolve the conflict by choosing one change or merging them.”