microsoft / microsoft/vscode-pull-request-github

Show files with conflicts next to resolve conflicts

Open
#5,949 1 comment 0 reactions 1 assignee View on GitHub

@alexr00 is already working on this.

Since Apr 23, 2024.

feature-request upstream
Dominant language
TypeScript
Stars
2.6k
Forks
796
Avg merge
1d 4h
Merged PRs (30d)
46

Description

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.

Contributor guide

No contributing guide indexed for this repository

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.