search

JetpackDuba / Gitnuro

A FOSS Git multiplatform client for newbies and pros
https://gitnuro.com/
GNU General Public License v3.0
869 stars 44 forks source link

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

Open st-patrick opened 3 weeks ago

st-patrick commented 3 weeks ago

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):

JetpackDuba commented 2 weeks ago

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.