vovauniversal.blogg.se - Github desktop stash changes

Github desktop stash changes mac#
Github desktop stash changes windows#

If you want to unstage only specific files, use the command git restore -staged instead.

to mark conflict (s) as resolved and unstage all files in the staging area.

Github desktop stash changes mac#

Maybe I was just spoiled when magic stashing was around, but it was such an awesome git experience, and I will never work on Mac without it. Manually (or ideally using some merge tool, see below) resolve the conflict (s). This takes a long time if you have a lot of files you dont want to stash. It doesnt take a filename, but you could just skip other files with d until you reached the file you want stashed and the stash all changes in there with a. But when I tried the updated GitHub Desktop, it didn't have magic stashing, and didn't have any way to switch branches with work in progress without leaving the app to stash with the command line. You can interactively stash single lines with git stash -p (analogous to git add -p ). I found the next best thing on GitKraken, with stashing in the app, and a visual indication of when you have stashed work on a branch.

Github desktop stash changes windows#

No such (magic stashing) solution exists on Windows (that I have found). So I thought, if I get a GUI client, maybe it will have the neat branch switching behavior.

What if I forget that I had work in progress stashed on that branch? You have to manage it manually. When I had to use Windows at work, I started out using git in the command line, and was constantly annoyed with how you would have to stash before switching branches. This was my first git client (before even learning command line git), and it was just perfectly natural that switching branches would save your progress on the branch you were on before, and you could switch back to it later and all the work in progress would be there. I will not use the new app or use any other app unless this feature appears in them. I would still want to see option in preferences if you feel people are likely to always choose one or the other. What do you want to do?īuttons: Stash (as above) Carry over Cancel

Modal popup: You have uncommitted changes. make "Always stash when switching branches" an option you can set in preferences. Stash changes?īuttons: Stash (default button implemented if you hit Return stashes and switches to selected branch) Cancel: Returns you to the app.Įven better flow: Add checkbox Do not ask again

Modal popup - You have uncommitted changes.

I really think you made the wrong call here.Īnyway, IMHO, the minimal flow should be: Within each file (if they are plain text files), GitHub Desktop will also show what lines are added and what lines are deleted. GitHub Desktop will show what files were modified. Right now you have many people just not using the new app as opposed to a few corner cases. GitHub Desktop should detect the changes made under the team-wiki folder. If there are issues related to magic stashing, as listed above, wouldn't those same issues surface if someone used the command line to stash? I mean, aren't these git issues, not desktop app issues? If stash would throw an error if run at the command line, then magic stashing could do the same thing: display the error and tell the user the stashing failed and they need to deal with it.Īnd if those issues are corner cases, as you say, well there are always going to be corner cases. Please show your love and support by sharing this post.Can anyone name one mainstream desktop app that forces you to go to the command line to perform a common, simple operation? I don't think so.Īlso, Mac users love the feature, Windows users never had it, so the solution is to take it away from everyone? Really?

Force-delete the temporary branch from local git repository.

Merge changes from the temporary branch into the destination branch.

Navigate/checkout to the "destination branch" where we need the changes Stashing takes the dirty state of your working directory that is, your modified tracked files and staged changes and saves it on a stack of unfinished changes that you can reapply at any time (even on a different branch).

Save a new commit object in the local git repository.

Create a new temporary branch and apply stashed changes to it.

If the branch you wish to apply stashed changes to already exists, you could use a temporary branch to help add the stashed changes to it like so: If you wish to apply stashed changes to a new branch, you can simply create a branch from a stash like so:Īs you can see, you first need to stash changes before you can apply them to a new branch when using git stash branch.Īpply Stashed Changes to an Existing Branch

You can quite simply do git stash save on the branch where you have the changes, and then do git stash pop on the branch you want the changes to be in. Save Stashed Changes and Pop Them Into a Different Branch