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

If the last commit is a merge commit, prompt to confirm for "undo last commit" #69937

Closed
vilicvane opened this issue Mar 7, 2019 · 2 comments · Fixed by #71525
Closed

If the last commit is a merge commit, prompt to confirm for "undo last commit" #69937

vilicvane opened this issue Mar 7, 2019 · 2 comments · Fixed by #71525
Assignees
@joaomoreno
Labels
feature-request Request for new features or functionality git GIT issues help wanted Issues identified as good community contribution opportunities verification-needed Verification of issue is requested verified Verification succeeded
Milestone
October 2019

Comments

@vilicvane
Copy link

Several developers in our team have encountered problem because of accidentally undoing last merge commit. I think it would be nice to prompt if the last commit is a merge commit.
@vscodebot vscodebot bot added the git GIT issues label Mar 7, 2019
@joaomoreno joaomoreno added feature-request Request for new features or functionality help translation Issues related to translation - translation help wanted help wanted Issues identified as good community contribution opportunities and removed help translation Issues related to translation - translation help wanted labels Mar 8, 2019
@joaomoreno joaomoreno added this to the Backlog milestone Mar 8, 2019
@jmbockhorst jmbockhorst mentioned this issue Apr 1, 2019
Merged
@wesinator wesinator mentioned this issue Jun 25, 2019
Closed
@joaomoreno joaomoreno self-assigned this Oct 9, 2019
@joaomoreno joaomoreno added the verification-needed Verification of issue is requested label Oct 17, 2019
@joaomoreno joaomoreno modified the milestones: Backlog, October 2019 Oct 17, 2019
@alexr00 alexr00 added the verified Verification succeeded label Oct 29, 2019
@alexr00
Copy link
Member

alexr00 commented Oct 29, 2019

Works great, but it might be good to make it a modal dialog since action is required.

joaomoreno added a commit that referenced this issue Oct 29, 2019
@joaomoreno
add modal to undo merge commit
32a529d 
related to #69937
@joaomoreno
Copy link
Member

@alexr00 I like that 32a529d

@vscodebot vscodebot bot locked and limited conversation to collaborators Dec 1, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@joaomoreno joaomoreno

Labels
feature-request Request for new features or functionality git GIT issues help wanted Issues identified as good community contribution opportunities verification-needed Verification of issue is requested verified Verification succeeded
Projects
None yet
Milestone
October 2019
Development

Successfully merging a pull request may close this issue.

Confirm "Undo last commit" if its a merge commit jmbockhorst/vscode
4 participants
@joaomoreno @vilicvane @alexr00 and others