My friend has a great method he uses . If he feels the other person is getting aggressive then he gives them a hug. I have seen him do it on lots of occasions and the situation was diffused ever time. He told me at first it was a risk but now he does it Everytime and it's always worked.