50 likes | 59 Views
Learn different methods for merging updates and branches, including manual merging and utilizing the SVN Copy command. Understand the importance of branching and how to create branches and merge them into the trunk.
E N D
Merging your changes Anand Tikotekar Sumanth Jujjuru
Different ways • Normal Update • Branch and Merge
Normal Update • SVN Update • U, G, C letters C: three files .mine, .old, .new • Manual merge
Branch and merge • Why Branch • How to create a branch • Merge branches into trunk