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

This episode demonstrates how to use the git interactive add command. It covers all of the major features of interactive adding, including status, update, revert, add untracked, patch and diff

For those of you with a spare 12 minutes to learn something new today, I’ve made a quick screencast on how the Longest Common Subsequence problem works, how it is applied to finding differences between text documents, and how it can be implemented and optimized in ColdFusion. Admittedly, there...