So I think this is something we're not doing right, and the docs are not clear on it either, so I thought I'd post here and see what come out.
We use SVN. We often have 2-3 branches going at the same time. When a branch is released (deployed and code frozen) we want to merge it into the trunk. To do that the only option I've seen is integrate, but integrate doesn't do what I want it to do, it seems to remove files that shouldn't be removed from the trunk. People are generally developing in the trunk as well.
What we'd like to do is simply take the changes from the branch's head, and merge them into the trunk... what's the trick? on command line svn we do svn merge head:head URL, how is this done in idea I don't see an svn merge command anywhere. Reason I want to do it in idea and not svn command line is so that we can see any conflicts and resolve them.
Thanks, I'm sure this is likely going to be a lame and duh moment, but hey I had to ask.