• Save
Five Steps To Svn Merging
Upcoming SlideShare
Loading in...5
×
 

Five Steps To Svn Merging

on

  • 1,980 views

Five simple steps to SVN Merge.

Five simple steps to SVN Merge.

Statistics

Views

Total Views
1,980
Views on SlideShare
1,969
Embed Views
11

Actions

Likes
0
Downloads
0
Comments
0

2 Embeds 11

http://www.linkedin.com 10
https://www.linkedin.com 1

Accessibility

Categories

Upload Details

Uploaded via as Microsoft PowerPoint

Usage Rights

© All Rights Reserved

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

Five Steps To Svn Merging Five Steps To Svn Merging Presentation Transcript

  • Five Steps To SVN Merging
    Mahmudul Haque Azad
  • 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!
  • Lets start merging [use case]
    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 (??) in next two slide.
  • Merging Step 4: 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.
  • Merging Step 4: 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!
  • Merging Done!
    After merging you will get the result like below. Now handle only conflicted files and do an integration test!
  • Happy Development!!!
    Best of luck