[Qgis-community-team] Re: svn merge

[Tara Athan]

Jurgen - thanks for the help - that worked out very well in Tortoise 
SVN, especially with the diff tool. I will add this tip to the 
DocumentationWriters or Manual Management wiki when that is editable 
again. So to reiterate, the procedure should be:
When commiting to SVN:
If the repository file has been modified since your last checkout, the 
commit will fail.
There is no danger of accidentally overwriting someone else's modification.

If this error occurs,
1. In Tortoise SVN, run svn update to merge any changes that have been 
made since the last checkout into your local copy
2. manually resolve any conflicts that appear.
    > In Tortoise SVN, right click on the original copy of the file with 
conflicts and select Edit Conflicts.
    > Right-click on each conflict, shown in red and select a method of 
resolution
3. run svn commit

Tara