Skip to content

Feature: Allow merging folders in the conflict dialog #10595

Description

@angaratosurion

What feature or improvement do you think would benefit Files?

Files currently supports solving conflicts with folders but not sub files

Requirements

  • Add a "merge" option to the conflict dialog, this should be visible for folders
  • If there are conflicts with the sub files, the conflict dialog should display again and allow the user to solve the new conflicts.

Files Version

Έκδοση: 2.3.63.0 OS Version: 10.0.22000.1281

Windows Version

Windows 11 Pro 21H2

Comments

No response

Metadata

Metadata

Assignees

No one assigned

    Labels

    Projects

    Status
    🔖 Ready to build

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions