files-community / files-community/Files
Feature: Allow merging folders in the conflict dialog
Open
area - file operations
- Dominant language
- C#
- Stars
- 45.4k
- Forks
- 2.9k
- Avg merge
- 19h 7m
- Merged PRs (30d)
- 62
Description
### 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_
Contributor guide
Assessment
This issue has not been assessed yet.