Git：在隐藏到当前版本之间手动合并？

Question

While working on a feature I stashed my changes at times, when I thought there is a lot things done.

Now I realised I need some code that I implemented, stashed, then removed and stashed again. So I currently don't have it, but I have it in one of my shashed versions.

So I can't just apply that stashed version, because there is a lot of things I don't need to be merged. Is there a way to merge it manually?

Basically, I can see git diff between current version and stashed one with:

git diff stash@{n}

But how can I use a merge tool (I usually use "meld") to merge?

"Meld" is not a must.

Answer 1

Just do git stash apply (or pop ), and it brings the changes into you working directory. Then you could undo undesired changes and commit.

Answer 2

This is fairly simple

• checkout your branch and make sure there are no unchanged files
• apply the stash version you need, say n, with "git stash apply stash@{n}"
• now check the changes, keep the ones you need and remove the others; Meld should work all right here
• once you are sure you have the subset of changes you need, add and commit all the files

PS: Just to clarify, I think you meant to say using Meld as a diff-tool, and not merge tool. There is no merge happening in the question.