Try to intercept git pushes containing .svn files

Use a new method to notify user by email if merge fails.