Provide more context when resolving conflicts
- Dominant language
- C++
- Stars
- 3.9k
- Forks
- 1k
- Avg merge
- 1d 21h
- Merged PRs (30d)
- 127
Description

The above dialog appears when users choose to "resolve conflicts". The dialog doesn't give enough context to make a reasonable decision
- if the conflicting file has some generic name
- was edited too long ago for the user to remember what that file was or is—maybe the current user didn't edit the file at all
The missing context is:
- path information: where are the conflicting files located?
- editing information: who last edited each of the conflicting files?
- reasonable preview of both versions: users can easily change a file by accident by opening and comparing them, sometimes just setting another last modified date. A neutral preview, perhaps using nextcloud server's file preview rendering capabilities, could help.
This process is quite delicate because users might be put into the position of deciding about a file conflict caused by somebody else when folders are shared within a group. Or they might have no recollection of editing something, perhaps a configuration error, bug, or unknown to them background process changed a file without their knowledge.
Contributor guide
Research direction
The issue names no files, tests, or entry points. Start by locating the desktop conflict-resolution dialog, then determine how path information, editing information, and neutral previews should be presented; done means the dialog provides the listed context for both conflicting versions.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- cpp
- Domain
- design, desktop
- Issue type
- Feature
- Difficulty
- 5/5
- Estimated time
- Over a week
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 25/100