Skip to Main Content
Pragmatic Guide to Subversion
book

Pragmatic Guide to Subversion

by Mike Mason
November 2010
Intermediate to advanced content levelIntermediate to advanced
150 pages
2h 55m
English
Pragmatic Bookshelf
Content preview from Pragmatic Guide to Subversion
19Handling 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 ...

Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Start your free trial

You might also like

Reinventing the Organization for GenAI and LLMs

Reinventing the Organization for GenAI and LLMs

Ethan Mollick

Publisher Resources

ISBN: 9781680500035Errata Page