Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show files with conflicts next to resolve conflicts #5949

Open
Tyriar opened this issue Apr 23, 2024 · 1 comment
Open

Show files with conflicts next to resolve conflicts #5949

Tyriar opened this issue Apr 23, 2024 · 1 comment
Assignees
@alexr00
Labels
feature-request Request for new features or functionality upstream
Milestone
On Deck

Comments

@Tyriar
Copy link
Member

Tyriar commented Apr 23, 2024

Testing #5939

image

.com:

image

Depending on what files show up and how many there are often determines whether I'll actually do the resolve.
@alexr00
Copy link
Member

alexr00 commented Apr 24, 2024

100% agree. GitHub doesn't have API for this yet though, and it's very expensive to actually calculate the files.

@alexr00 alexr00 added feature-request Request for new features or functionality upstream labels Apr 24, 2024
@alexr00 alexr00 added this to the On Deck milestone Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@alexr00 alexr00

Labels
feature-request Request for new features or functionality upstream
Projects
None yet
Milestone
On Deck
Development

No branches or pull requests
2 participants
@Tyriar @alexr00