Subversion principles
|
| - |
Repository | | Lies on the Subversion server. On the SAM-repository are the different revisions.
| | - |
Working directory | | Your local directory, where you edit the documents, is called working copy.
Subversion 'knows', to which 'path in which repository' the working directory belongs.
| | - |
Merging | | You can work with others on the same file at the same time. Then changes from the repository are merged with your local changes,
when you update a particular file.
If the changes of the others do not correspond to your local changes, your local file has got both changes now.
Subversion detects a conflict and puts conflict markers into your file. Both changes are placed one below the other in your local file,
and you have to solve the conflict manually.
|
|
|
|
For questions please contact
ballarin@math.ethz.ch
|
