Merging source in SVN - The Koch Family
The Koch Family The Koch Family

Latest news

جاري التحميل ...

Merging source in SVN

My team has used Primefaces for our projects. We sometimes have several branches of the projects with a new Primefaces's release. For example, we currently have a project with two branches, a branch for using Primeface 4.0, a trunk for using Primeface 5.0, and we are working these parallel branches. Our project looks like the following:

- myProject
- branches
+ primefaces4
+ tag
+ trunk (primefaces5)

My problem is how to copy the same source from the trunk to the branch "primefaces4". That is where SVN Merging can help!

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:

Step 3: Select the revision from "trunk" to merge.
For example:

+  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 +


In my case, I have two times for merging. The first chosen revision is "7".

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".


If you like the content of our blog, we hope to stay in constant communication, just enter your email to subscribe to the blog's express mail to receive new blog updates, and you can send a message by clicking on the button next ...

إتصل بنا

About the site

author The Koch Family <<  Welcome! I'm so glad that you stopped by Your Modern Family blog. Together, we will talk about raising kids, organizing the home and saving money! and Tips & tricks and more…

< Learn more ←

Blog stats

Sparkline 2513183

All Copyrights Reserved

The Koch Family