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

Impl/stash selected changes #16535

Open
wants to merge 6 commits into
base: development
Choose a base branch
from

Conversation

MS-Painter
Copy link

@MS-Painter MS-Painter commented Apr 15, 2023

Closes #11531

Description

Resolving this issue revealed underlying issues in Desktop's current implementation and handling of git stashes that affected the solution I went with:

  • Desktop only recognizes and manages git stashes made by Desktop.
  • Desktop doesn't fully manage all of a branch's stashes.
  • git stash commands can't "ammend" existing stashes.

Given these issues, there is no currently defined right approach that Desktop adheres to.
Leading me to decide to try to solve the issue from the user experience POV the issue itself expected -
A singular stash Desktop is familiar with that can be ammended.

The actual implementation I went with:

  • "Ammend" existing Desktop stash by using git stash pop then pushing back with the new changes.
  • Stash selected files (does not include diff partial file stashes).

Screenshots

2023-04-15

Release notes

Notes:

@MS-Painter
Copy link
Author

An issue I'm aware of that needs cleanup -
When we do the temporary git stash pop we apply _refreshRepository which makes the UI show the popped files briefly.

git.stash.pop.issue.mp4

@Jhoine Jhoine linked an issue Jun 6, 2023 that may be closed by this pull request
@tidy-dev tidy-dev removed a link to an issue Aug 10, 2023
@jorisw
Copy link

jorisw commented Mar 26, 2024

@tidy-dev Please either review or close this nearly year old PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Stash specific file/s or stash selected files
2 participants