Changes between Version 7 and Version 8 of SvnOverview
- Timestamp:
- 02/12/07 01:53:24 (18 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
SvnOverview
v7 v8 73 73 * It is possible for two people to change the same chunk of code at similar times, and when the commit happens, this will be detected, and the users will have to interact to resolve the conflicts. 74 74 * A process similar to '''diff''' finds the conflicts 75 * Right click !TortoiseSvn, and try merge and/or blame to deal with conflicts 76 77 75 78 76 Proceed on to the [wiki:SvnTutorial].