How to merge the branch into trunk? Following are the simple steps for this.
1. Take a fresh checkout of trunk
svn checkout http://svn_path/trunk
2. cd trunk
3. If your working directory points to the trunk, then you should be able to merge your branch with:
svn merge http://svn_path/branches/branch_name
be sure to be to issue this command in the root directory of your trunk
4. List all modified file using following command
svn status -u | grep M
5. Copy the log in text file. Next open the project in netBeans or RapidSVN and resolve the conflicts by doing diff.
Command to see which all files are modified in last few commits
svn log -v -r{"2013-06-02 00:00:00"}:{"2013-06-11 00:00:00"}