Hello, Which is the best & full proof method to merge our code changes in a production file. Right now, we are copying files from production in our local working dir, & making code changes in it . At the week of implementation we are taking the diff between our file(in which we have added some code changes) and the production version. The problem with this is, the production version keeps on changing in weeks, so while i complete my code changes & production version is also changed.so i see other person code changes also. Presently, iam copying my code changes manually into production file, but as this is too risky, iam not sure abt it. We are using SCCS for source control.

I am not familiar with SCCS, but the purpose of a good source control system is so that you do not have problems like that. A source control system can keep up with multiple people making changes to the same source program at the same time. The first developer to merge his changes does so with no conflicts. The second etc developer to merge changes may encounter conflicts with code that was changed since his "check out", and the system shows these conflicts and presents various options on how they might be handled. You may already be aware of the full capabilities of SCCS, but if not, my suggestion would be to explore SCCS advanced merging capabilities.

If you are using SCCS properly, you have version control. Proper check-in and check-out procedures take care of the merging. I'd suggest that you follow Jim's suggestion and read up on SCCS. Try a google search. You will get a significant number of hits, many of which will explain what you are looking for.