Open fmorroni opened 1 week ago
@fmorroni I can't reproduce your issue, there is something wrong? Here are the steps I followed. 录屏 2024-09-30 09-26-37.webm
@wugeer my bad, the instructions were wrong. You should actually commit the changes that cause the conflict and then pop the stash.
@fmorroni Indeed, the issue you mentioned is occurring here. I will try to resolve it. :)
Describe the bug Stashes are removed from the stash list when popped even if there are conflicts. This is different from the git standard. From git stash documentation:
To Reproduce Steps to reproduce the behavior:
Expected behavior Stash should be applied but not removed in case of conflicts.
Context:
Arch Linux x86_64
- Kernel:6.10.10-arch1-1
gitui nightly 2024-09-12 (0f5cf89)
0.26.3-2
1.81.0