git - Smartgit:将本地更改从存储移动到分支

Question

我有存储在 stash 中的本地更改。我现在(之后)创建了一个新分支，并想将我的更改从 stash 推送到这个分支。 SmartGit:本地 > 应用存储。

当我尝试 SmartGit 时问我:Restore Index (checkbox)，这是什么？选还是不选？

Answer 1

Restore Index 选项将导致 git stash apply --index。根据the git man page ，这意味着:

If the --index option is used, then tries to reinstate not only the working tree’s changes, but also the index’s ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally).

所以，一般来说，是的，您应该尝试应用启用此选项的存储。