On, at 18:27, Tiernan L Apologies for the late reply! I hope it is not too late to help you.īy any chance did you rename the branch with the stashes? This will cause your stash to be hidden (not intentional). I do feel the option should be probably disabled in Desktop until it’s working right.

It’s way too late to save that commit, but the lesson I learned by losing 3 days work was “Never ever bring uncommitted work to a new branch”. No, i did not rename the branch with the stashes. Hahaha - Hi Tiernan, thanks for replying. new-file-name4 = IGNORED, VANISHED FROM REPOĪgain, I haven’t committed anything, so maybe unstaging the changes to the new branch (via a soft reset) will work, and then i can switch branches and see what’s going on. new-folder4 = IGNORED, VANISHED FROM REPO old-file-name3 = OK, CHANGES DIFFED IN GITHUB DESKTOP

old-file-rename2 = NOTICED, REQUIRES COMMAND LINE ADD old-file-rename1 = IGNORED, VANISHED FROM REPO New branch only has these changes: /old-folder-rename1 = IGNORED, VANISHED FROM REPO Let’s say these are some of the files i worked on, from my working “master” branch: /old-folder1Īnd all the files had uncommitted changes, with some directories and filenames changed: /old-folder-rename1 Losing untracked files would be of course expected, if i were not trying to bring the changes to the new branch. I’m aware that from the point of viee of the upstream master, these were untracked files, but here is an outline of what was lost or updated. It’s 3 days work that seems to have vanished. I don’t actually want these changes going to the new branch because of the missing files/directories - I would like to first commit my uncommitted changes to the previous “master” branch for safekeeping. I would like to switch to my former working “master” branch to find out if changes were stashed, but it seems i am blocked from switching branches until i resolve merge conflicts in the new “feature” branch. Then i noticed the missing directories and hundreds of missing changed/added files Version & OS

Tried to commit changes to new branch, but not possible (thankfully!) - merge conflicts reported unresolvable.

New branch was automatically re-based on an upstream master, not my working “master” forked repo.

Clicked “Bring my changes to the new branch” not “Stash changes on current branch”.

Clicked New Branch in GitHub Desktop, created the “feature” branch.

Decided to bring the changes to a new “feature” branch, on my own repo.

Made many uncommitted changes to my own “master” fork of an upstream “master” repo: changed and added many files, changed many directory names.

Github desktop stash