GitHub for Mac sync deleted my uncommitted changes

Question

I use GitHub for Mac version 210 on Mac OS X 10.10. Hitting the "sync" button deleted my uncommitted changes. Is that supposed to happen from time to time? I've never had this issue till then, though I've mostly used Github for Windows.

I thought that if I had some uncommitted changes that conflict with whatever there is in the GitHub repository, hitting the "sync" button would fail and yield the following error message:

German Attanasio · Answer 1 · 2016-01-26T16:10:56.583

21

The Github Desktop creates an stash with your changes.

You can list the stashes with:

git stash list

And apply the one that Github Desktop created by doing:

git stash apply stash@{0}

For more information about git stash see this.

edited Jan 26 '16 at 16:10

answered Sep 09 '15 at 18:56

German Attanasio

22,217
7
47
63

6

This saved my day! they should warn the user before stashing. – XAnguera Feb 16 '16 at 10:05
5

Phew. I was sweating there for a few minutes. – Andrew Zimmer Apr 22 '16 at 18:34
1

hahaha I was in your situation and it's not a good thing specially on a Friday... – German Attanasio Apr 22 '16 at 18:41
1

Literally almost cried. Lost about 6hours of hard work. TYTYTY!~ – agrublev Jan 14 '17 at 02:57
I will buy you a beer. I cannot believe Github Desktop does this. Freaked me out for 24 hours. – Modermo Apr 21 '17 at 04:24
Let me know if you are around Boston. I want that beer! – German Attanasio Apr 21 '17 at 12:37
Life saver! don't forget to refresh the project to see if your changes are really there!. And merge any conflicts before calling this. – htafoya Apr 27 '17 at 20:22

score 2 · Answer 2 · answered Apr 08 '17 at 13:50

2

Command line is the way to go. I faced the same situation. When I did a stash list in the Terminal it showed me "GitHub: Stashing to pull in remote changes". And I was able to retrieve my local uncommitted changes back again. :)

answered Apr 08 '17 at 13:50

SoniA

158
1
7

score 1 · Answer 3 · edited May 23 '17 at 11:47

1

It did happen before (even for GitHub for Windows).

For added changes to the index, a git fsck --full --unreachable --no-reflog could help (as I mentioned here)

edited May 23 '17 at 11:47

Community

1
1

answered Aug 15 '15 at 06:41

VonC

1,262,500
529
4,410
5,250

Thanks. How comes sync can sometime reset the index to the latest fetched commit? – Franck Dernoncourt Aug 19 '15 at 07:15
@FranckDernoncourt not sure (it depends on how sync is implemented). Maybe the new GitHub Desktop (Windows or Mac: https://desktop.github.com/) has fixed this – VonC Aug 19 '15 at 07:16
1

Same happened for me, files gone and git fsck doesn't find the deleted files – Dainius Kreivys Apr 24 '17 at 15:39

GitHub for Mac sync deleted my uncommitted changes

3 Answers3

Linked