Five Steps To Svn Merging

2,493 views
2,275 views

Published on

Five simple steps to SVN Merge.

0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
2,493
On SlideShare
0
From Embeds
0
Number of Embeds
25
Actions
Shares
0
Downloads
0
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Five Steps To Svn Merging

  1. 1. Five Steps To SVN Merging<br />Mahmudul Haque Azad<br />
  2. 2. Few Points to ponder!<br />Always start on Green Light! i.e. start merging when both Trunk and Branch are fully committed and they are showing green color.<br />Merging always take place within a working copy i.e. in trunk. <br />In every commit do not forget to add comment in the comment box. Mind it this is important!<br />
  3. 3. Lets start merging [use case]<br />We have a main trunk<br />We have taken a branch named “CallForStandardFeedBack” branch.<br />After taking this branch, codes in both trunk and branch are modified by concerned developers.<br />Now we want to merge “CallForStandardFeedback” branch back to trunk and we have lots of changes both in trunk and merge.<br />
  4. 4. Merging step: 1<br /><ul><li>All files are committed and we have green tick mark in our folder. Now we can start merging. </li></li></ul><li>Merging step: 2<br />Right click on Trunk go to TortoiseSVN-&gt;Merge and Click Merge<br />
  5. 5. Merging step: 3<br />Select “Merge a range of revisions” and click next.<br />
  6. 6. Merging Step 4<br />Select the value as appropriate in the picture below. Explaining (??) in next two slide.<br />
  7. 7. Merging Step 4: Range Of Revision<br />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. <br />
  8. 8. Merging Step 4: Reverse Merge<br />Reverse Merge is basically to decouple the changes the was committed with trunk before while merging one particular branch with trunk.<br />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. <br />
  9. 9. Merge Step 5<br />Use the default value in this form and click merge to get the job done!<br />
  10. 10. Merging Done!<br />After merging you will get the result like below. Now handle only conflicted files and do an integration test!<br />
  11. 11. Happy Development!!!<br />Best of luck<br />

×