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

Loss of uncommitted data using unapply #3765

Open
gullitmiranda opened this issue May 14, 2024 · 2 comments
Open

Loss of uncommitted data using unapply #3765

gullitmiranda opened this issue May 14, 2024 · 2 comments
Labels
bug Something isn't working

Comments

@gullitmiranda
Copy link

Hello, I recently ran some tests on GitButler and accidentally lost all the uncommitted changes I had made when I clicked on the "unapply" option.
I was struggling to move an uncommitted file to a virtual branch, but it wasn't working. These files were in the staging area before configuring GitButler. Now, it seems like I've lost all my work.

If the "unapply" option is meant to discard changes, shouldn't there be a confirmation prompt before doing so?

@krlvi
Copy link
Member

krlvi commented May 14, 2024

Hey! This is definitely not something that should happen. Just so that I understand better what happened - after unapply, are you able to see your unapplied branch on the sidebar, but without the most recent changes?

In case there's bug that create such a scenario, it should still be possible to recover changes - check out this guide:
https://docs.gitbutler.com/troubleshooting/recovering-stuff
This is not a super ergonomic recovery process (and we are working on a better interface, which should land this week), but the diffs should be there.

If it would be helpful I can walk you through this on Discord / whatasapp so that you get your changes back. Then afterwords, if possible, I'd love to take a look at the application logs and try to see if I can recreate this.

@Byron Byron added the feedback requested Feedback was requested to help resolve the issue label May 16, 2024
@gullitmiranda
Copy link
Author

Sorry for the delay @krlvi .

I ended up finding the documentation on recovery after creating the issue, but I didn't have time to test recovery from wd

just fyi, what I tested and it didn't work

  1. Recovery from lost commits (reflog)
  2. Recover using git for-each-ref | grep gitbutler, but it did not have the information discarded from the stage.

Having said that, I've already taken a preliminary look at wd (https://docs.gitbutler.com/troubleshooting/recovering-stuff#recovering-a-working-directory-state), it seems to me that at least some of the changes are there.

I'll try to look into this sometime this week, as this specific loss is more a matter of convenience, as it concerns my dotfiles. So it's not something crucial that I can't lose.

@Byron Byron added bug Something isn't working and removed feedback requested Feedback was requested to help resolve the issue labels May 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

3 participants