Murmele/Gittyup

Unable to discard changes to conflicted files

Open

#342 opened on Oct 30, 2022

View on GitHub
 (0 comments) (0 reactions) (0 assignees)C++ (167 forks)auto 404
buggood first issue

Repository metrics

Stars
 (2,245 stars)
PR merge metrics
 (PR metrics pending)

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

Research direction
Inspect the code that determines when the 'Discard changes' context menu action is enabled. Ensure that conflicted files are allowed, since `git checkout <file>` works for them.
Tech stack
cpp
Domain
desktopdeveloper experience
Issue type
Bug
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
2
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
1-3 hours
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
Fresh
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
Clear
Prerequisites
GitC++
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
70