We used SVN from the command line to create a branch copy of our project, and have since deployed that branch to production. Now the main line of development is on the trunk. So we want to merge the branch back to the trunk before the next release. Our project is a multi-module J2EE project.
Using IntelliJ 6.06, I checked out the trunk code from SVN and created the multi-module project by importing the modules. I have some questions about using IntelliJ to do the SVN merge:
1. Is source 1 the trunk code, and source 2 the branch code?
2. Do you have to integrate each module separately (they look like separate directories under the SVN trunk and branch directories), or just select the entire trunk as one source and the current branch as the other source?