How to make git merge handle uncommitted changes to my working tree?

Question

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). No

Answer 1

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.