I've used PhpStorm to merge changes to my SVN working copy, after which a couple of tree conflicts occured. I'm looking for a way to resolve these conflicts within PhpStorm.
Does PhpStorm have a feature which allows you to resolve SVN tree conflicts? Or is there an option to mark these conflicts resolved?
Currently the only solution I have is to invoke svn from the command line, or use a third party tool like Tortoise SVN.