7.3 Git Tools - Stashing and Cleaning in Pro Git.The stashing coverage in the “Filesystem interactions” chapter of Git in Practice ( book website or read on GitHub).Then you reapply and delete the stash and pick up where you left off.įor more details about stashing, I recommend Commit-level: Discard commits in a private branch or throw away uncommited changes: git reset: File-level: Unstage a file: git checkout: Commit-level: Switch between branches or inspect old snapshots: git checkout: File-level: Discard changes in the working directory: git revert: Commit-level: Undo commits in a public branch: git revert: File. In our case, “do something else” is to get the upstream changes with a nice, simple git pull. Now you can do something else, without a lot of fuss. In the middle of the day, this file had unknowingly popped up on the 'Staged files'. Git stash is a way to temporarily store some changes to get them out of the way. Cannot discard nor remove the mysterious file in Sourcetree. But if you want to use git stash, this opportunity is as good as it gets. I am not a big fan of git stash I think it’s usually better to take every possible chance to solidify your skills around core concepts and operations, e.g., make a commit, possibly in a branch. (I personally would choose to commit and execute a workflow described in 29.2.) Now what? First, you must safeguard your local changes by either stashing or committing them. From :jennybc/ethel db046b4.2d33a6f main - > origin/main Updating db046b4.2d33a6f error: Your local changes to the following files would be overwritten by merge: foo.R Please commit your changes or stash them before you merge. remote: Total 3 ( delta 1 ), reused 1 ( delta 0 ), pack-reused 0 Unpacking objects: 100% ( 3/3 ), done. remote: Compressing objects: 100% ( 2/2 ), done. remote: Counting objects: 100% ( 5/5 ), done. D ethel $ git pull remote: Enumerating objects: 5, done.
0 kommentar(er)
