November 2010
Intermediate to advanced
150 pages
2h 55m
English
| 19 | Handling Conflicts Using Tortoise |
During an update, Tortoise will keep track of any files that have conflicting changes, coloring them red in the update window. At the very end of the update log will be a message reminding you that some files were conflicted and that you should fix the problem. You can fix conflicts later by right-clicking files in Windows Explorer and choosing TortoiseSVN > Edit conflicts, but it’s usually easiest to do it from the update window by double-clicking each conflicted file.
The TortoiseMerge window is split into three sections. The top-left pane shows “their” changes, that is, the changes someone else made and committed to the repository. The top-right pane shows “my” changes, that is, the changes we made in ...