If you want more control, you always have the option to use the command-line as long you can remember how. When you apply a stash you have the option to keep or remove it: Then when you’re ready, right-clicking on the stash in the navigator gives you options to apply or delete the stash. Git saves stashed changes to the repository and Xcode lists them in the source control navigator: However, if you accidentally apply the wrong stash with git stash pop, it can be tricky to undo those changes. When working with Git, stashing changes is a useful way to temporarily save work without committing it to the repository. To save these changes without committing, from the Xcode menu Source Control > Stash Changes.: Undoing Git Stash Pop Changes: Simple Example.
#UNDO GIT STASH APPLY CODE#
Assuming I’ve made some changes to my source code (see Swift 5.1 two quick tips): Most git clients allow you to do this and now you can also do it directly in Xcode 11. However, yes, a good method to protect against repeated mistakes is to apply the stash and then commit it instead of stashing. 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). JoseRondon git stash apply would apply the stash to your working tree, which is beyond the scope of restoring an accidentally dropped stash. But sometimes, this back and forth workflow results in merge conflicts.
“You need to fix this now” – I have to interrupt what I’m working on and switch branches but I’m not ready to commit my changes. When we finish our work on the new feature, we apply the stashed changes with the git stash pop command. Drop the Most Recent Stash Delete the most recently created Git stash by running: git stash drop The command deletes the most recent stash. Use git stash apply to redo previously stashed changes, but keep them. I don’t want to commit the changes but I’m not ready to throw them away either. Use git stash pop to redo previously stashed changes and remove them from stashed list. “There must be an easier way” – I’m deep into a set of changes and realise I may be going in the wrong direction. Calling git stash without any arguments is equivalent to git stash push. “I’ll just fix this while I’m here” – I’m about to commit some changes but I notice while reviewing my work that I made an unrelated change that doesn’t belong in this commit. The modifications stashed away by this command can be listed with git stash list, inspected with git stash show, and restored (potentially on top of a different commit) with git stash apply. Here’s a quick look at how stashing works and a bonus tip! Git Stashing Having said that when Git stashing was added in Xcode 11 I have found myself using it.
I like being able to see and compare changes in the editor but I prefer the command-line or an external Git client for branch and repository management. I’ve never been a big user of the version control integration with Xcode.
0 kommentar(er)
