Conflict dialog needs some redesign on mobile
Nobody has claimed this yet.
- Dominant language
- JavaScript
- Stars
- 659
- Forks
- 133
- Avg merge
- 1d 20h
- Merged PRs (30d)
- 110
Description
We need to figure out a better way to let users decide about a hard conflict with the file content.
Currently this is kind of squashed and not really usable on smaller screens:
With rich workspace it is even worse:
@jancborchardt @nimishavijay Do you have any good suggestion for that?
This is happening if users are currently editing a text file (or if it has unsaved changes) and the file is updated externally e.g. by uploading a new version through the web interface or clients. I was also thinking about just always applying the latest content and getting rid of the conflict dialog but this might also confuse users as the content would change unexpectedly on the text editor.
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Start by reproducing the conflict dialog on a small screen, including the rich workspace case, using the screenshots and the described external file update scenario. The issue does not name files or tests; the work is not ready to start until the interaction redesign and expected behavior are agreed.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- javascript
- Domain
- frontend, mobile
- Issue type
- Feature
- Difficulty
- 5/5
- Estimated time
- Over a week
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 25/100