About this block

File Conflict Resolver is the resolution view for files edited in two places at once, headed by Resolve conflicts and a line noting 2 files were changed on two devices at the same time. Each conflict is a card whose header carries the file name, its folder path, and a Conflicted badge, with a two option radio choice below comparing the copy on this device against the cloud copy. Each option shows the editor avatar and name, the edit time, and the size, with the newer copy carrying a Newer badge and each card offering a Keep both action. A summary bar at the bottom reads 2 conflicts waiting on a choice beside Keep both for all and Apply choices buttons.

Conflicts are one typed array, each with two versions and a keep field setting which radio option is selected by default, plus an optional latest flag on the newer version driving the Newer badge. The device and cloud sides read from the same shape, so a new conflict only needs its two versions and a default choice.

When to use

Reach for this block when a sync engine detects the same file changed in two places, wired to your conflict queue. Default the selection to the newer copy but let the user override, and always offer keep both so no edit is lost by accident.

A natural flow around it on an Application Pro page:

Before

• File version history
• Sync status panel

After

• Activity feed

What you can display

One strong use is the file sync conflict. Other conflict shapes:

• Document merge review. Two edits of a doc side by side, with a changed lines count per version.
• Settings conflicts. A local config against a synced one, comparing changed keys instead of size.
• Import duplicates. An incoming file against an existing one, with a keep both or replace choice.

Tip: badge the newer copy and default to it, most people want the latest edit and only need to override the rare exception.