I'm working with Tortoise SVN and Pycharm 3.0, since we have 3 folders in the project trunk, branch, tag i want to merge my changes from one branch to the trunk.
I'm trying to use the Integrated option but it always end with error, can you explaine the integrate option or maybe there is a guide o show to work with it? I've found this http://www.jetbrains.com/pycharm/webhelp/integrating-changes-to-branch.html
but it doesn't work..
Also if anyone have some suggestion maybe on other Version system i'd like to hear.