In this episode we walk though how to resolve code conflicts using the TortoiseSVN client.

By the end of this episode you should be able to use both the Diff and Merge tools that are built into TortoiseSVN to manage and resolve any code conflicts that may arise