Git checkout partial files after stashing in other branch
Only one file seemed to be effective in the previous branch. To return towards previous topic branch, I ought to stash scattered files into stash at first, otherwise get an error from git.
git merge and git merge — squash
There were a few difference between master branch and my feature branch. On the feature branch I pull master branch in order to merge the differences into feature branch.