Problem with merge solution

HI,    I'm introducing to this kind of software (version controllers) and I have a little question.  I have a repository with an application source code, and 2 users working with it. The problem comes when both are trying to modify the files at the same time. Normally Everyone works on his own machine, but in this case they can only work in an specific directory. So if both decide (at the same time) to look or modify the code, both will dowload it to the same folder in the same server.  Do anyone knows a solution for this problem? Thanks    Orcrist

Last updated 19 years ago

I apologize if this is insulting, but I would tell the users to not use the same directory. This is more a logical error than a source control issue, and certainly not specific to Subversion.