Our team has recently migrated to git. 

We have production web application server with some small changes to code

* ultra hot hotfixes specific to this installaton
* some debugging statements for those bugs that can't reproduced in our testing enviroment

I think, we can't commit those in server repo.

When we had `svn update` either merged changed file or not merged. Now

```
 git stash; git pull; git stash pop

```

does the trick for me

How can I automatically detect those cases when `git stash pop` will cause conflicts

making production working copy broken? 

I want send mail to resolve these cases manually

**before** they occur like `be advised, pull cancelled (conflicts)`