Multiple Users

Hello..
        I tried some Googlin' and didn't find anything worth while on
this subject, but here's our issue.
        Say we're working on a web site project and there are a couple
users working on the site.

        User1 has a local copy of the repository on their computer and
they make changes here which they then commit to the SVN.
        User2 is a user which is logging directly on the web server to
make changes to the server's local copy of the repository. The test web
site sees their changes immediately.

        The issue is that User1 and User2 just happen to make changes to
the same file; User1 adds a function, User2 is editing a different
function.

        User1 commits their changes, but what will happen to User2's
changes when they go to commit their changes?
        Will Tortoise report to User2 that there's a mismatch and they
need to update the local copy first?
        Won't updating the file overwrite the changes just made by
User2?

        Thanks.. -Jeff

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-05 17:42:15 CEST