![]() > T00:43:49.896Z - info: Executing dropStashEntry: git stash drop (took 4.749s) > T00:43:49.862Z - info: Executing createStashEntry: git stash push -m !!GitHub_Desktop (took 69.418s) > T00:43:45.146Z - info: Executing getStashEntries: git log -g -z -pretty=%gD%x1F%H%x1F%gs refs/stash (took 3.085s) > T00:43:45.046Z - info: Executing getWorkingDirectoryDiff: git diff -no-ext-diff -patch-with-raw -z -no-color HEAD - include/Color.h (took 6.038s) > T00:43:42.060Z - info: a stash was created successfully but exit code 1 reported. > This looks like the relevant bit in the log file: On Sat, Feb 20, 2021, 1:19 AM Steve Ward wrote: Reply to this email directly, view it on GitHub You are receiving this because you were mentioned. ![]() That should create a recovery branch off of your stash. Let me know if that shows your stashed changes. Try opening the repository in the command line and You should be able to recover the stash by checking out a new branch off Unfortunately not a lot of other information is given about what may have It looks like you hit an exit code 1 error during the stash operation. This looks like the relevant bit in the log file: ![]() On Sat, Feb 20, 2021, 1:19 AM Steve Ward thanks for the report. Try opening the repository in the command line and running this command: You should be able to recover the stash by checking out a new branch off of the associated SHA. Unfortunately not a lot of other information is given about what may have caused this. T00:43:49.896Z - info: Executing dropStashEntry: git stash drop (took 4.749s) T00:43:49.862Z - info: Executing createStashEntry: git stash push -m !!GitHub_Desktop (took 69.418s) T00:43:45.146Z - info: Executing getStashEntries: git log -g -z -pretty=%gD%x1F%H%x1F%gs refs/stash (took 3.085s) T00:43:45.046Z - info: Executing getWorkingDirectoryDiff: git diff -no-ext-diff -patch-with-raw -z -no-color HEAD - include/Color.h (took 6.038s) T00:43:42.060Z - info: a stash was created successfully but exit code 1 reported. This did not result in finding the stash. I then tried creating a stash of the previous commit which I based my changes on. I tried git apply stash but unfortunately, the stash it applied was from last year and so I deleted them. I then tried several troubleshooting steps (found on the internet) to try and find a stash. Additional contextĪfter noticing the stashed changes were gone I still pulled from the repo. The changes weren't stashed and instead were simply deleted with no warning. ![]() I expected the changes to be stashed so that after I pulled from the repository I could apply and merge my changes. There was no "restore stash" pop-up like usual.Ĭonclusion: somehow "Stashing All Changes" deleted all my changes without any warning. I navigated to "Branch" -> "Stash All Changes" again and clicked.Īll changes disappeared from the changes tab. I waited 3 minutes and nothing noticeable happened. In GitHub Desktop, I navigated to "Branch" -> "Stash All Changes" and clicked. The better you organize your work, the more often you will pick option 1 from the list above.Navigating to "Branch" -> "Stash All Changes" twice results in the stashed changes being deleted. ![]() In any case you'll have to merge branches in the end if you want to integrate your work. If you want to continue on the other branch, just change directories. Changes should apply cleanly then.ĭo it in a different workspace: Do git clone of your repository in a different directory, hacking and comitting there. Then hack along, committing changes, finally return to your work using git checkout A and git stash pop. So if you are implementing something on branch A and you need to do something different on the project, and you have uncommitted changes, you have two choices:ĭo it in the same workspace: Then do git stash saving your uncommitted changes, create a new branch (probably on master) with git checkout -b master or checkout an existing branch. General advice: Do different things on different branches at different times, or do different things in different workspaces concurrently. So when restoring the stashed changes, there was a merge conflict. What happened was this: You changed a part ("Updated upstream") while your changes were stashed that was also changed in the stashed part ("Stashed changes"). ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |