Changes between Version 3 and Version 4 of SvnMerging
- Timestamp:
- 01/17/07 21:48:22 (17 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
SvnMerging
v3 v4 11 11 * '''Svn merge is not what you think.''' The syntax is not intuitive...in particular, the 12 12 {{{ 13 From: 13 From: (start URL and revision of the range to merge) 14 14 }}} 15 15 and 16 16 {{{ 17 To: 17 To: (end URL and revision of the range to merge) 18 18 }}} 19 19 sections of the GUI do not mean what you think. '''Both''' refer to the code ''from which'' you will get your changes. The code ''to which'' your changes will be made (pending any conflicts) is the working copy...determined by context (where you did the right-click) in the GUI.