How to avoid file replacement?

Question

Programming

Internal employees work on the project and outsiders are involved. Often the work goes on the same files. Who and how solves the issue of replacing the code when unloading?

Answer 1

The simplest is to inject SVN into the process.
Prepare a repository and organize a minimal process - one day of work for one person with a sysadmin mindset. If necessary, then one more day to read the documentation and experiment.
If the “project” is an application / site, etc., then all modern IDEs can work with SVN through built-in plugins, so there shouldn’t be any configuration difficulties. For other cases, there is TortoiseSVN (windows) or even a completely trivial console. Accordingly, the repository must be available to all participants (on the Internet, if the project is distributed).
You can sharply accustom to work with SVN simply by covering other file sharing paths (SFTP, FTP, Samba, etc). As practice shows, if you show which buttons to press, then even the most difficult colleagues to change the usual process in 15 minutes grasp the essence.
An important clarification: this is exactly a solution to the problem indicated in the question, in conditions of ignorance of the details, so I do not touch on branching issues, project managers, policies, and other things.
If you are interested, I can later write an article on the implementation of SVN in a web project for 3 programmers.

Answer 2

svn?

Answer 3

tortoisesvn.net

Answer 4

git?

Answer 5

mercurial as DCVS seemed to me easier to understand.
Well, or in the worst case, this is solved by organizational methods.
During development, each participating party creates its own copy of the file / site / project. And they only work with them.
A specially trained person™ aka project manager maintains the master branch and makes the decision to put the project into production. You can also make him responsible for maintaining these branches - creates, deletes, merges changes. Of course, only if one of the users does not know how to do this, which is usually true in the case of third-party employees.

Answer 6

I will add one more version control system to the proposed svn and git - sourceSafe from microsoft.
Of the benefits - if you work in MS Visual Studio, you can work with turnips directly from the studio. You can also block the file from any changes by other participants until the lock is released by you or the admin, in general, there are goodies, like everywhere else.

Answer 7

You can use ready-made hosting of version control systems so as not to bathe with the settings. There is an opportunity on google code and in unfuddle.com, for example. All that is needed, developers to read about the use, if not in the know. I would recommend Mercurial as it's a good distributed system and has a decent eclipse plugin. With SVN, over time, you will still switch to git / mercurial / bazaar, because it is more convenient, and it implements svn clumsily with branches.