desktop / desktop/desktop

Add "Discard Conflicts and Pull" button

Open
#17,507 0 comments 4 reactions 0 assignees View on GitHub
enhancement not-planned
Dominant language
TypeScript
Stars
21.8k
Forks
10.5k
Avg merge
1d 15h
Merged PRs (30d)
25

Description

### The feature request

When pulling, sometimes you have conflicting files that you really dont care about. Like metadata that changed.
See this example, where a value changed in a material that I dont want to keep anyway.
![image](https://github.com/desktop/desktop/assets/71507608/2a698a60-f552-4dd5-8ccd-35a63082a757)

It would be great to add a button that can discard conflicting files and then re-pull the latest changes.

Right now you need to close the window, find all the changes, discard them, and pull again manually, while it would be better to do this in a single button.

### Proposed solution

Improved flow of the software

### Additional context

_No response_

Contributor guide

Open the contributing guide

Research direction

Start by tracing the pull flow where conflicting files are shown and compare it with the existing discard and pull actions. Done means users can discard the conflicting files and re-pull the latest changes through one button, without closing the window or handling each file manually.

Written by the indexing model from the issue text.

Assessment

Tech stack
electron, git, typescript
Domain
desktop, devtools
Issue type
Feature
Difficulty
4/5
Estimated time
3-5 days
Activity status
Stale
Clarity
Mostly clear
Newbie friendliness
35/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.