git stash -> merge stashed change with current changes
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I made some changes to my branch and realized I forgot I had stashed some other necessary changes to said branch. What I want is a way to merge my stashed changes with the current changes. Is there a way to do this? Its more for convenience, I eventually gave up and committed first my current changes, then my stashed changes, but I would have preferred to get them in with one fell swoop. 回答1: Running git stash pop or git stash apply is essentially a merge. You shouldn't have needed to commit your current changes unless the files changed in