Unable to discard changes to conflicted files
Open
Nobody has claimed this yet.
bug
good first issue
- Dominant language
- C++
- Stars
- 2.3k
- Forks
- 171
- Avg merge
- 3d 19h
- Merged PRs (30d)
- 10
Description
Currently the right click Discard changes on a file is greyed out when this file has conflicts pending resolve.
But git checkout -- filename is possible whatever the file state.
Contributor guide
No contributing guide indexed for this repository
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 right-click context-menu handling for a file's Discard changes action and the code path used by git checkout -- filename. Compare why the action is disabled for conflicted files; done means the action is available there and discards the file's changes consistently.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- cpp, git
- Domain
- desktop
- Issue type
- Bug
- Difficulty
- 2/5
- Estimated time
- 1-3 hours
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 45/100