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

Git Merge Resolve Dialog #84620

Open
stetsonsarecool opened this issue Nov 12, 2019 · 2 comments
Open

Git Merge Resolve Dialog #84620

stetsonsarecool opened this issue Nov 12, 2019 · 2 comments
Assignees
@chrmarti
Labels
feature-request Request for new features or functionality merge-conflict Merge conflict decorations and actions

Comments

@stetsonsarecool
Copy link

Issue Type: Feature Request

This is a request for the ability, when a user resolves all of the merge conflicts in a file, for VS Code to ask whether they would like to mark the entire file as resolved in Git.

VS Code version: Code 1.36.1 (2213894, 2019-07-08T22:56:38.504Z)
OS version: Darwin x64 19.0.0
@vscodebot
Copy link

vscodebot bot commented Nov 12, 2019

(Experimental duplicate detection)
Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:

@chrmarti chrmarti assigned joaomoreno and unassigned chrmarti Nov 13, 2019
@joaomoreno
Copy link
Member

joaomoreno commented Nov 13, 2019 •
edited

@chrmarti Since the git merge extension already probes for conflict markers... and handles all the actions... shouldn't it be the one detecting this case?

@chrmarti chrmarti assigned chrmarti and unassigned joaomoreno Nov 13, 2019
@chrmarti chrmarti added feature-request Request for new features or functionality merge-conflict Merge conflict decorations and actions labels Nov 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@chrmarti chrmarti

Labels
feature-request Request for new features or functionality merge-conflict Merge conflict decorations and actions
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@joaomoreno @chrmarti @stetsonsarecool