I have been working on a project and tried to do myself a favor and setup a production version and a development version. I've made a stupid mistake and forgot, so I have made changes in both versions and don't remember which I made where. So my two questions are:
1. Are there any tools to help me merge this two projects together so I don't lose any of my code?
2. What is a good way to manage your code to prevent code loss? Is there a good program to help with that?
Thank you very much
...
Go to the complete details ...