Version control: branches, tags, merging, the folder you work in. Some SVN links.
Posted by jpluimers on 2014/10/09
When using any version control system, understanding which idiom you should follow to do proper branching, merging, tagging, etc is key to your process, and the most difficult thing to get a feel for.
For me, the most confusing part is that branches, tags, and the trunk are directories (both on your development system and the SVN server), and it is hard to see which local directory is switched to what remote one.
As soon as I understood that this was the most confusing aspect for me, I could focus on it and handle it much better.
For SVN (and TortoiseSVN), these links proved to be very valuable for me:
- Tortoise SVN documentation: Branching / Tagging.
- “How to” SVN Merge with TortoiseSVN.
- svn – Good branching and merging tutorials for TortoiseSVN? – Stack Overflow.
- Version Control with Subversion (great book, free)
- When you did not think ahead: svn – Can you commit an existing working copy to a new branch using TortoiseSVN? – Stack Overflow.
- svn – What is the simplest way to do branching and merging using TortoiseSVN? – Stack Overflow.
- svn – Using TortoiseSVN how do I merge changes from the trunk to a branch and vice versa? – Stack Overflow.
- tortoisesvn – Tortoise SVN Merge: Branch->Trunk with Revision History from both Tree – Stack Overflow.
- svn – How to create a new branch using TortoiseSVN – Stack Overflow.
- TortoiseSVN switch Branches – Stack Overflow.
- Use TortoiseSVN to merge branch changes with the trunk – Stack Overflow.
–jeroen
The Wiert Corner - irregular stream of stuff 
Leave a comment