- myProjectMy problem is how to copy the same source from the trunk to the branch "primefaces4". That is where SVN Merging can help!
- branches
+ primefaces4
+ tag
+ trunk (primefaces5)
Here is the steps those I have conducted in my project.
Step 1: open the project with the branch "primefaces4"
Step 2: Team > Merge... Chose the trunk's URL.
For example: http://192.168.9.10/svn/myProject/trunk
Step 3: Select the revision from "trunk" to merge.
For example:
+--revision--+--date--------+--author----+--comment---+In my case, I have two times for merging. The first chosen revision is "7".
+ 10 + 03.10.2014 + vanhuong + f1: part 3 +
+ 9 + 03.10.2014 + ACB + f2: part 2 +
+ 8 + 02.10.2014 + ACB + f2: part 1 +
+ 7 + 01.10.2014 + vanhuong + f1: part 2 +
+ 6 + 01.10.2014 + M2M + f0: part 3 +
+------------+--------------+------------+------------+
Step 4: Click "Merge". You code is merged from trunk with revision from "6" to "7".
Step 5: Update code and resolve conflict (if needed)
Step 6: Back to Step 3 with the revision "10".