SvnExample (diff) – TracDoc at trac.fzj

Changes between Version 1 and Version 2 of SvnExample


Ignore:
Timestamp:
10/28/09 10:12:53 (9 years ago)
Author:
anonymous
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • SvnExample

    v1 v2  
    2222}}}
    2323
    24 
     24To get changes from other persons, update has to be called. If someone else has changed the same file and svn cannot merge the changes, you have the to resolve this conflict (see http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.resolve)
    2525{{{
    2626% svn update