Recently I’ve come across some problems on managing trunk/branches/tags. As a result of manual merging two branches I’ve ended up with hours spent on editing conflicts and checking the system. It’s obvious this was not a good sign as new bugs might have been introduced.
I’ve decided to organise the way the revision control system is used. Below you can find descriptions of two most common scenarios.

