Changes between Version 1 and Version 2 of SvnExample
- Timestamp:
- 10/28/09 10:12:53 (15 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
SvnExample
v1 v2 22 22 }}} 23 23 24 24 To 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) 25 25 {{{ 26 26 % svn update