a 'git pull' command works like 'svn update'?

Question

I am using 'git' to checkout chromium code by following this document: http://code.google.com/p/chromium/wiki/UsingGit

And it said 'Run git pull or whichever command is appropriate to update your checkout. '.

But the problem I run into is when I have local changes in my git working directory and then I run 'git pull'. It said something like XXX file can't get update (I made a change locally). I force 'git pull' to work by removing my change 'git checkout -- XXX.cpp'

Is there a way to get 'git pull' to merge automatically if possible (the svn update equivalent)?

Thank you.

Answer 1

If you want a pull to merge with changes you have made locally, you will need to commit your changes to your local directory first. Or, stash your changes, then pull, then re-apply your stash.