Git にスタッシュを適用する

pc@JOHN MINGW64 ~/Git (main) $ git stash list stash@{0}: WIP on main: 78129a6 Revert "$git status" stash@{1}: WIP on main: 195e5c3 $git status 

$ git stash apply stash@{stash_index} 

$ git stash apply stash@{1} Removing text.txt.txt CONFLICT (modify/delete): Tutorial.txt deleted in Updated upstream and modified in Stashed changes. Version Stashed changes of Tutorial.txt left in tree. On branch main Changes to be committed:  (use "git restore --staged <file>..." to unstage)  deleted: text.txt.txt  modified: text.txt.txt.bak Unmerged paths:  (use "git restore --staged <file>..." to unstage)  (use "git add/rm <file>..." as appropriate to mark resolution)  deleted by us: Tutorial.txt Untracked files:  (use "git add <file>..." to include in what will be committed)  .bash_history.bak  Delftscopetech/  New folder/  file.patch 

pc@JOHN MINGW64 ~/Git/Delftscopetech (main) $ git stash pop stash@{0} Removing README.md On branch main Your branch is up to date with 'origin/main'. Changes not staged for commit:  (use "git add/rm <file>..." to update what will be committed)  (use "git restore <file>..." to discard changes in working directory)  deleted: README.md no changes added to commit (use "git add" and/or "git commit -a") Dropped stash@{0} (1531151482186b97f47e9b852ac29ddd194bd099)