I am trying to migrate to PHPStorm on a Mac from a development environment on Windows XP (running in a VM) using Zend Studio 5.5. In Windows I use TortoiseSVN (tsvn) and do all my svn work outside the IDE. So far I am able to duplicate most of the operations of svn from within PHPStorm. But I don't see how to accomplish the svn merge function.
I develop in "current" and then merge updated files into "stable"; then into "production". In tsvn you just select the destination directory and go through the contect menu to get the merge function. How do you do this in PHPStorm? Cannot find any instructions about merging for svn.