Skip to main content

conflicted copy

A conflicted copy is an extra copy of a file that is saved when synchronization finds incompatible changes in different versions of the file and cannot merge them automatically.

In plain English

This is a separate file kept alongside the original when two versions have been changed in ways that do not fit together. Synchronization saves it because it cannot combine those changes into one file on its own.

In context

Here, "conflicted copy" names the extra file that is shown because synchronization found incompatible edits and could not merge them automatically.

Situation
Creating, saving, sharing, versioning, and restoring files
What it communicates
names the extra file shown when conflicting edits are present.

Meaning limits

The term by itself does not say which version is correct or whether any of the changes were kept in the main file.

Examples

“When sync could not combine edits from two versions of the notes, it saved a conflicted copy beside the original file.”

Core meaning

“Open the conflicted copy and compare its text with the main document.”

In context