I'm working with Pycharm 2018.3.3 Community Edition and I'm struggling getting my svn that uses tags, branches and trunk kind of structure to work. So I can merge my branch back into the trunk using the Integrate Directory option and it also prompts the merge conflict editor when I do this. However when I try to rebase my branch (so merging the trunk back into the branch because ideally I would like to do my conflict solving in the branch and not in the trunk) this method doesn't work. And whenever I try to integrate the trunk (or any other branch) into my current branch it just simply overrides it.
I also tried to merge from option in the svn toolbar but this always, no matter what I do prompts the error "Cannot merge from self".