I'm a solo developer at my company, doing everything from database to deployment. I have two "versions" of the applications I work on; development and production (maintanence).
I'm at a point now where I'd like to make my break again, so that I can have the maintanence bug-fix only branch, and the main development trunk. What I had been doing is deleting the $/maint branch, and then branching my $/devel folder.
I'd just like to check if this is the right way to go, or should I merge changes from $/devel to $/maint? I started to do that, but then somethings don't seem to transalate, like new files don't get added to $/maint. Also, I get the entire history to choose to merge, so I'd need to find exactly where I branched previously it seems.
What's the best way to do this? I just need my development version and one maintance version... all users are forced to use the same production version of my software, they don't get a choice.
![Smile :)](./images/smilies/icon_smile.gif)
Thanks
Andy