The same problems exist with text files (like prgs, etc). We've made the decision to not branch as it caused more problems than it solved...and these are all C++ text files. We make the changes in multiple versions. At some point you say, "we won't support anything older than version x."


>Ok, fair enough. How to handle making sure that we can work on new development (projects) and also bug fixes to production when they both share the same code? Right now, I have some processes in place where I keep things local in a project (backed-up and archived of course) and only check them all back in when they are close to release. The other guy does it similar to me, though not near as retentive in making sure that the files are in sync. Things like binary files, especially the project always have to be manually figured out. Also, it's just hard because the codeset you started with back a few months ago has changed due to production fixes and now you have to merge everything all over again Seems like there has to be a better way of doing it.