if you already have a stash, we'll need to also warn that stashing again will overwrite the existing stash, just like we do in the switching branches stashing flow. It'll continue to use the same paradigm that exists today, where you can't have multiple stashes per branch. Select one or more files in the changes tab > right click > new option for "Stash selected files".New Stashes tab (next to Changes/History): Similar to the History tab, displays a list of all stashes in the stack with context menu options for each to apply a specific stash to the working copy.New Branch menu option: "Apply last stash to working copy" (equivalent to git stash pop).New Branch menu option: "Stash all changes" (equivalent to git stash).Proposed solutionsĪny or all of these feature suggestions would contribute to making it easier to manage your git stash: I don't bother to use the more complex git stash operations, but if there was a GUI option to control them I would definitely use them more. It would be awesome to have a simple way to stash all working copy change or only selected files/lines as well as to have a stash browser that can make viewing/applying stashes easier. The only git command that I still need to manually run in the CLI is git stash and git stash pop - everything else I typically do with git can be done via the GitHub Desktop client. I'll post here to prevent issue duplication, but I have some ideas for how to make this feature even more useful: Describe the feature or problem you’d like to solve Reply to this email directly, view it on GitHub, or unsubscribe.I was just typing up a feature suggestion when I saw this issue. You are receiving this because you were mentioned. Let us know and again, apologies for the delay. See the Help menu in Desktop to access the logs. If you could share your logs from that day, it would helpful. If this was not the case, I can investigate further as you may be correct in your comment about those parallel issues. If so, once you change the name of the branch back to the original name and the stash should reappear. 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
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |