starting and aborting a merge with conflicts results in deletion of previously uncommitted changes

[st-patrick]

Describe the bug
I had uncommitted changes in my project and started a merge.
When the merge resulted in a conflict and there was no convenient tool available, I aborted the merge via abort button in the GUI.
All my changes, inculding the merge-unrelated previous uncommitted changes, have been deleted

To Reproduce
Steps to reproduce the behavior:

1. make any changes to any file and save
2. check to see that gitnuro shows "uncommitted changes"
3. find some branch that will result in conflict when merging or create a conflict
4. merge that branch
5. abort
6. notice how your changes form step 1 are forever gone

Expected behavior
restore previously uncommitted changes when aborting

Desktop (please complete the following information):

• OS: macOS Sonoma
• Version 1.3.1

[JetpackDuba]

Thanks for your report! I'm sorry you lost your uncommited changes, as you mentioned, that's something that Gitnuro should prevent.

Thinking a bit about it, I'm considering creating some kind of auto-stash (without taking away the changes from the workspace) before merging and re-apply it when the merge is aborted, but I'll have to think about possible alternatives.