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

Allow stashing changes even if stash is already present but there is no conflict #18539

Open
Andrej730 opened this issue May 1, 2024 · 1 comment

Comments

@Andrej730
Copy link

The feature request

Let's say you edited file A and then stashed the changes.
Then you either added other changes to A or modified file B and if you try to stash you'll get a warning previous stash will be discarded.

image

Current workaround is to restore stashed changes (it's done in clever way and works fine if there are unstaged changes without conflicts) and then stash them all.

Proposed solution

Allow adding new changes to stash if there are no conflicts.

Additional context

This feature will be very useful if #11531 will be implemented.

@justingolden21
Copy link

+1

Have been thinking this for a while but never bothered to make an issue.

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

3 participants