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

   - Stash changes from my working directory
   - Pulling changes bringing changes in this same file from other person
   - 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.

   Is this normal? There shouldnt be merge conflicts when applying my stash 
   changes affect the changes in the same file got from the pull?
   How to deal with this situation in order to avoid my stash changes 
   override changes got from a pull?

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to