Two programmers working on a Visual C# program

Question

I and another programmer am working on the same program in Visual C#. I let him work on it, and then he uploads it and then I work on it, and then I upload it so that he can work on it. We take turns altering the source code.

However, this is kind of slow. It would be better if we were able to both work on the source code at the same time without taking turns, and then there was someway we could combine our changes easily. Is there a way to do that?

Answer 1

Source control... Take a look at Subversion with TortoiseSVN front-end.

http://en.wikipedia.org/wiki/Source_control

Answer 2

As Mike C. said, Source Control allow you to do that. Source Control creates a central place where code is stored, and allows teams to work simultaneously on the same code in a controlled way. When two programmers change the same file, the second one to check-in (upload their changes to the source control repository) is warned that another programmer has changed the same file and allows him/her to merge both changes if there are conflicts between them.

Other advantages are that it keeps a history of all changes made by every programmer so that you can trace who made what changes very easily.