| 20 | Handling Conflicts Using Cornerstone |
When you update from the repository, Cornerstone will track any files where Subversion encounters a conflict. Unfortunately, Cornerstone is not very verbose in telling you that files are conflicted; you need to select the Modified or Conflicted view in the working copy browser in order to easily see conflicted files.
Cornerstone includes simple conflict resolution strategies. In most cases, you should edit the conflicted file to remove the <<< and >>> conflict markers. These markers are labeled so that you can see the difference between your version of the file and the repository version. For each conflict, determine what the correct code block should be, and edit the file to reflect your choice. Once ...
Get Pragmatic Guide to Subversion now with the O’Reilly learning platform.
O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.
