How to manage trunk/branches/tags in the project while bug fixing and regular development? | Blinded by the lights