A co-worker and I are both working on the master branch at the moment. I have some code in my working tree that I don’t want to commit (debugging statements and the like). Now if he commits changes to some of those same files, I can’t merge them:
$ git merge origin/master
Updating 1b8c5c6..eb44c23
error: Entry 'blah.java' not uptodate. Cannot merge.
Coming from a subversion background, I’m used to having my working tree automatically merged when I pull changes from the repository and if there are conflicts, I resolve them manually.
The quickest way I have found to do this in git is:
$ git stash
$ git merge origin/master
$ git stash pop
Essentially, removing my uncommitted changes, doing the merge and then re-applying the changes. How can I tell merge to automatically merge my working tree with the changes I’m trying to pull in?
As far as I can tell, the best you can do is what you already have with
git stash. I too find it strange that merge wants to deal only with clean trees.