git中的“stash apply”覆盖了从pull中获得的更改

Question

I got in this situation today. I had some changes in one file to commit but before I wanted to do a pull for this file so I did the next

1. Stash changes from my working directory
2. Pulling changes bringing changes in this same file from other person
3. Stash apply my changes

What I have found after "stash apply" is that the changes I got after doing the pull were overriden with with my stash changes.

1. Is this normal? There shouldnt be merge conflicts when applying my stash changes affect the changes in the same file got from the pull?

2. How to deal with this situation in order to avoid my stash changes override changes got from a pull?

Thanks

Answer 1

You can try to stash your local changes first, then pull, then pop the stash.

git stash
git pull origin master
git stash pop

You will have to manually resolve anything that overrides changes from remote, because it will have conflicts.

Hope it helps.