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

"Unapply and drop changes" shouldn't be shown when there are no changes #5683

Open
hferreiro opened this issue Nov 26, 2024 · 4 comments
Open
Labels
enhancement An improvement to an existing feature UX/UI Focusing on user satisfaction, usability, and overall experience

Comments

@hferreiro
Copy link

hferreiro commented Nov 26, 2024

Version

0.13.17

Operating System

macOS

Distribution Method

dmg (Apple Silicon)

Describe the issue

On a new empty lane, "Unapply" and "Unapply and drop changes" do the same thing. The latter shouldn't be shown in that case.

How to reproduce

No response

Expected behavior

No response

Relevant log output

No response

@hferreiro hferreiro added the bug Something isn't working label Nov 26, 2024
@Byron Byron added UX/UI Focusing on user satisfaction, usability, and overall experience enhancement An improvement to an existing feature and removed bug Something isn't working labels Nov 26, 2024
@Byron
Copy link
Collaborator

Byron commented Nov 26, 2024

Thanks a lot for reporting!

It does indeed seem like "Unapply" is the only thing one would show there.
CC @PavelLaptev

@PavelLaptev
Copy link
Contributor

Related issue #5586

@PavelLaptev
Copy link
Contributor

Thank you for your feedback, @hferreiro.
There is definitely an ambiguity here that I’ve been struggling with too.
@krlvi @Caleb-T-Owens, we’ve discussed this, but we decided to postpone it. What do you think?

Here is my proposal:

  • If there are no changes — disable "unapply and drop changes".
  • If it's a new branch that hasn’t been pushed and doesn’t have any changes, disable "unapply", and instead of "unapply and drop changes" use "remove".

@hferreiro
Copy link
Author

That makes a lot of sense, thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement An improvement to an existing feature UX/UI Focusing on user satisfaction, usability, and overall experience
Projects
None yet
Development

No branches or pull requests

3 participants