Click here to Skip to main content
11,583,865 members (62,859 online)
Click here to Skip to main content

Five Steps to SVN Merging

, 11 Jan 2011 CDDL 21.7K 8
Rate this:
Please Sign up or sign in to vote.
Few Points to ponder!Always start on Green Light! i.e. start merging when both Trunk and Branch are fully committed and they are showing green color.Merging always take place within a working copy i.e. in trunk.    In every commit do not forget to add comment in the comment box. Mind it this is impo

Few Points to ponder!

  • Always start on Green Light! i.e. start merging when both Trunk and Branch are fully committed and they are showing green color.
  • Merging always take place within a working copy i.e. in trunk.    
  • In every commit do not forget to add comment in the comment box. Mind it this is important!

 

Use Case for Merging

  • We have a main trunk
  • We have taken a branch named “CallForStandardFeedBack” branch.
  • After taking this branch, codes in both trunk and branch are modified by concerned developers.
  • Now we want to merge “CallForStandardFeedback” branch back to trunk and we have lots of changes both in trunk and merge.

Merging step: 1

  • All files are committed and we have green tick mark in our folder. Now we can start merging.

 

 

 

 

 

 

 

 

Merging step: 2

  • Right click on Trunk go to TortoiseSVN->Merge and Click Merge

 

 

 

 

 

 

 

 

 

 

 

 

 

 

Merging step: 3

  • Select “Merge a range of revisions” and click next.

Merging Step 4

  • Select the value as appropriate in the picture below.

 

 

 

 

 

 

 

 

 

 

 

 

 

 

Explaining ??

  • Range Of Revision: Range of revision is actually all those range of changes that we want to merge with trunk. As we are merging a full branch with trunk so we will select all the ranges like below.

     

 

 

 

 

 

 

 

 

 

 

 

  • Reverse Merge: Reverse Merge is basically to decouple the changes the was committed with trunk before while merging one particular branch with trunk. Say for example we have implemented one menu in one branch and merged it with trunk. After few days it is needed to rollback every code related with that branch. In that case we will use reverse Merge.

Merge Step 5

  • Use the default value in this form and click merge to get the job done!

 

 

 

 

 

 

 

 

 

 

 

 

 

 

After merging you will get the result like below. Now handle only conflicted files and do an integration test!

 

 

 

 

 

 

 

 

 

 

Happy Merging!

License

This article, along with any associated source code and files, is licensed under The Common Development and Distribution License (CDDL)

Share

About the Author

Mahmudul Haque Azad
Software Developer (Senior) Vizrt Bangladesh
Bangladesh Bangladesh
I am truly versatile and 360 degree Engineer having wide range of development experience in .NET and Java Platform. I am also proficient in system level programming in C++. To me technology is not at all a problem, it’s the client requirement that matters! That is I am ready and comfortable to use any technology to make the business of my client a success.

In my five years of experience I have the opportunities to work for fortune 500 companies of US and many renowned clients from Europe.

My Linkedin Profile: http://bd.linkedin.com/in/mahmudazad

You may also be interested in...

Comments and Discussions

 
GeneralMissing steps Pin
Bernhard Hiller19-Jan-11 23:40
memberBernhard Hiller19-Jan-11 23:40 
GeneralRe: Missing steps Pin
Mahmudul Haque Azad20-Jan-11 15:42
memberMahmudul Haque Azad20-Jan-11 15:42 
Generalnic Pin
Pranay Rana11-Jan-11 20:29
memberPranay Rana11-Jan-11 20:29 
GeneralMy vote of 1 Pin
GriffinPeter7-Jan-10 4:20
memberGriffinPeter7-Jan-10 4:20 

General General    News News    Suggestion Suggestion    Question Question    Bug Bug    Answer Answer    Joke Joke    Rant Rant    Admin Admin   

Use Ctrl+Left/Right to switch messages, Ctrl+Up/Down to switch threads, Ctrl+Shift+Left/Right to switch pages.

| Advertise | Privacy | Terms of Use | Mobile
Web04 | 2.8.150603.1 | Last Updated 11 Jan 2011
Article Copyright 2010 by Mahmudul Haque Azad
Everything else Copyright © CodeProject, 1999-2015
Layout: fixed | fluid