Applying stash changes in git, where the stash contains files that has been moved

My current branch has moved certain files to different folders, and the stash created had made changes to the files which were located in the old folders. How to properly apply the stash without breaking anything, and would like to know the easiest method for this.

Solution

I see a few simple steps to do:

Move some files, only those that are required by a git stash show, back to old place:
```
git mv file old_place/file
```
Apply stash to those files:
```
git stash pop
```
Merge the changes, if any:
```
vim ...
git add ...
```
Move files back to the proper places:
```
git mv old_place/file file
```

After that you will get the added into index files with applied stash.