正如@Brandan所建议的，以下是我需要做的事情

error: Your local changes to the following files would be overwritten by merge:
       file.txt
Please, commit your changes or stash them before you can merge.
Aborting

遵循以下流程:

git status  # local changes to `file`
git stash list  # further changes to `file` we want to merge
git commit -m "WIP" file
git stash pop
git commit -m "WIP2" file
git rebase -i HEAD^^  # I always use interactive rebase -- I'm sure you could do this in a single command with the simplicity of this process -- basically squash HEAD into HEAD^
# mark the second commit to squash into the first using your EDITOR
git reset HEAD^

这样你就可以对文件进行完全合并的本地更改，准备好进行进一步的工作/清理或进行一次良好的提交。或者，如果你知道文件的合并内容是正确的，你可以写一个合适的消息，跳过git重置HEAD^。

正如@Brandan所建议的，以下是我需要做的事情

error: Your local changes to the following files would be overwritten by merge:
       file.txt
Please, commit your changes or stash them before you can merge.
Aborting

遵循以下流程:

git status  # local changes to `file`
git stash list  # further changes to `file` we want to merge
git commit -m "WIP" file
git stash pop
git commit -m "WIP2" file
git rebase -i HEAD^^  # I always use interactive rebase -- I'm sure you could do this in a single command with the simplicity of this process -- basically squash HEAD into HEAD^
# mark the second commit to squash into the first using your EDITOR
git reset HEAD^

这样你就可以对文件进行完全合并的本地更改，准备好进行进一步的工作/清理或进行一次良好的提交。或者，如果你知道文件的合并内容是正确的，你可以写一个合适的消息，跳过git重置HEAD^。

也许，合并(通过difftool)从…是的……一个分支!

> current_branch=$(git status | head -n1 | cut -d' ' -f3)
> stash_branch="$current_branch-stash-$(date +%yy%mm%dd-%Hh%M)"
> git stash branch $stash_branch
> git checkout $current_branch
> git difftool $stash_branch

博士tl;

先运行git add。

我刚刚发现，如果将未提交的更改添加到索引(即。" staging "，使用git add…)，然后git stash apply(以及git stash pop)实际上会进行适当的合并。如果没有冲突，你就是最棒的。如果不是，像往常一样使用git mergetool解决它们，或者手动使用编辑器。

需要明确的是，这就是我所说的过程:

mkdir test-repo && cd test-repo && git init
echo test > test.txt
git add test.txt && git commit -m "Initial version"

# here's the interesting part:

# make a local change and stash it:
echo test2 > test.txt
git stash

# make a different local change:
echo test3 > test.txt

# try to apply the previous changes:
git stash apply
# git complains "Cannot apply to a dirty working tree, please stage your changes"

# add "test3" changes to the index, then re-try the stash:
git add test.txt
git stash apply
# git says: "Auto-merging test.txt"
# git says: "CONFLICT (content): Merge conflict in test.txt"

．.． 这可能就是你想要的。

我这样做的方式是git先添加这个，然后git stash apply <stash code>。这是最简单的方法。

运行git stash pop或git stash apply本质上是一个合并。你不需要提交当前的更改，除非在存储中更改的文件也在工作副本中更改，在这种情况下，你会看到以下错误消息:

error: Your local changes to the following files would be overwritten by merge:
       file.txt
Please, commit your changes or stash them before you can merge.
Aborting

在这种情况下，您不能一次性将存储应用于当前更改。您可以提交更改，应用stash，再次提交，如果您真的不想要两次提交，则可以使用git rebase压缩这两次提交，但这可能会带来更多麻烦。