November 2010
Intermediate to advanced
150 pages
2h 55m
English
| 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 ...