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.

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

Don't use ResetMixed for "Unstage All" button when the commit is a merge #3565

Closed
kleee opened this issue Mar 2, 2017 · 0 comments
Closed
Milestone

Comments

@kleee
Copy link

kleee commented Mar 2, 2017

Hi,

The "Unstage All" command in the commit form is applying a ResetMixed operation. But, this operation will delete the Merge information.

I suggest to disable the button when it's a merge, or warn the user that this will "broke" the merge (ex with a popup : are you sure...).
In fact, we got some"wrong" merge due to this command in our company, and it's quite difficult to repair afterward.
I'm can try implement this, if you're agreed with the feature.

Regards,

@jbialobr jbialobr added this to the 2.50 milestone Mar 2, 2017
@jbialobr jbialobr changed the title Disable or warn "Unstage All" button when the commit is an merge Don't use ResetMixed for "Unstage All" button when the commit is a merge Apr 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants