Highlight diff in the conflict view
Nobody has claimed this yet.
- Dominant language
- JavaScript
- Stars
- 738
- Forks
- 162
- Avg merge
- 6h 2m
- Merged PRs (30d)
- 35
Description
Is your feature request related to a problem? Please describe.
SOmetimes when I got message The file was overwritten. Your current changes cannot be auto-saved. Please choose how to proceed. I need to choose which version I want to use.
It is difficult to find a difference in long files.
Describe the solution you'd like
Some kind of highlight in places where files differ
Describe alternatives you've considered
Copy-pasting to another app like meld
Additional context
Example from meld:
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 locating the conflict view reached after the “The file was overwritten” message and reproduce the overwrite conflict with a long file. Compare the current and overwritten versions there; done means differing places are visibly highlighted so users can choose a version without copying the content to another app.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- javascript
- Domain
- frontend
- Issue type
- Feature
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Quiet
- Clarity
- Mostly clear
- Newbie friendliness
- 48/100